From bf902aebc544bc77fc9aa6a4b542d0ab830688a9 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sat, 12 Mar 2022 19:43:18 +0100
Subject: [PATCH] dolibarr CRM

---
 apps/dolibarr/Dockerfile                |  2 +-
 apps/dolibarr/deployment.yaml           | 19 +++++++++----------
 apps/dolibarr/nginx-site.configmap.conf |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/dolibarr/Dockerfile b/apps/dolibarr/Dockerfile
index 37b10f0..cd2bc79 100644
--- a/apps/dolibarr/Dockerfile
+++ b/apps/dolibarr/Dockerfile
@@ -111,7 +111,7 @@ RUN set -ex; \
 	chmod 755 /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
+CMD ["php-fpm7.4"]
 
 # Arguments to label built container
 ARG VCS_REF
diff --git a/apps/dolibarr/deployment.yaml b/apps/dolibarr/deployment.yaml
index 356dafe..4dad291 100644
--- a/apps/dolibarr/deployment.yaml
+++ b/apps/dolibarr/deployment.yaml
@@ -41,25 +41,24 @@ spec:
               protocol: TCP
         - name: dolibarr
           image: cr.lan/dolibarr:latest
-          lifecycle:
-            postStart:
-              exec:
-                command: 
-                  - /post-start.sh
           volumeMounts:
             - name: www-data
               mountPath: /var/www/html
           env:
             - name: TZ
               value: "Europe/Berlin"
-            - name: POSTGRES_HOST
-              value: postgres.live-env.svc.cluster.local:5432
-            - name: POSTGRES_DB
+            - name: DOLI_DB_HOST
+              value: postgres.live-env.svc.cluster.local
+            - name: DOLI_DB_PORT
+              value: "5432"
+            - name: DOLI_DB_NAME
               value: dolibarr
-            - name: POSTGRES_USER
+            - name: DOLI_DB_USER
               value: dolibarr
-            - name: POSTGRES_PASSWORD
+            - name: DOLI_DB_PASSWORD
               value: Vb7yHzmE5HIjfU4hjghjghj6AnMdB
+            - name: DOLI_DB_TYPE
+              value: pgsql
           ports:
             - name: php-fpm
               containerPort: 9000
diff --git a/apps/dolibarr/nginx-site.configmap.conf b/apps/dolibarr/nginx-site.configmap.conf
index c1f6748..3e9cf23 100644
--- a/apps/dolibarr/nginx-site.configmap.conf
+++ b/apps/dolibarr/nginx-site.configmap.conf
@@ -25,7 +25,7 @@ server {
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 		fastcgi_param PATH_INFO $fastcgi_path_info;
 		fastcgi_param HTTP_PROXY ""; # prohibit httpoxy: https://httpoxy.org/
-		fastcgi_pass ${NGINX_PHP_CGI};
+		fastcgi_pass 127.0.0.1:9000;
 	}
 
 	## disable all access to the following directories