From 5727c5aee5ed1b180ade5ac1fec8be943b447149 Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Wed, 22 Mar 2023 17:09:20 +0100
Subject: [PATCH] fix stuff

---
 compose.yml   | 24 ++++++++++++++++++------
 entrypoint.sh | 45 ++++++++++++++++++++++++++++++---------------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/compose.yml b/compose.yml
index d32de6b..e52093d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -58,12 +58,12 @@ services:
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "coop-cloud.${STACK_NAME}.version="
-    # healthcheck:
-    #   test: ["CMD", "curl", "-f", "http://localhost"]
-    #   interval: 30s
-    #   timeout: 10s
-    #   retries: 10
-    #   start_period: 1m
+    healthcheck:
+      test: ["CMD", "cv", "api", "system.get"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 10s
 
 
   db:
@@ -86,6 +86,12 @@ services:
     #     backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
     #     backupbot.restore: "true"
     #     backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" wordpress < /tmp/dbdump.sql && rm -f /tmp/dbdump.sql'"
+    healthcheck:
+      test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
 
   db-civicrm:
     image: "mariadb:10.8"
@@ -99,6 +105,12 @@ services:
     secrets:
       - db_password
       - db_root_password
+    healthcheck:
+      test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
 
 networks:
   proxy:
diff --git a/entrypoint.sh b/entrypoint.sh
index 5905dc8..77246ea 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -42,24 +42,39 @@ su civicrm -c "wp core install --locale=de_DE --url=$BASE_URL --title=$PROJECT_N
 su civicrm -c "wp language core install de_DE"
 su civicrm -c "wp language core activate de_DE"
 
-echo "=== Running Civicrm Docker Install"
 
-pushd /var/www/html/wp-content/plugins/civicrm/
-  mkdir -p civicrm/l10n
-  cp -r l10n/de_DE civicrm/l10n
-  cp -r sql/civicrm_acl.de_DE.mysql civicrm/sql/civicrm_acl.de_DE.mysql
-  cp -r sql/civicrm_data.de_DE.mysql civicrm/sql/civicrm_data.de_DE.mysql
-popd
+if ! [[ -d /var/www/html/wp-content/plugins/civicrm/civicrm/l10n ]]; then
+  echo "=== Running Civicrm Docker Install"
+  pushd /var/www/html/wp-content/plugins/civicrm/
+    mkdir -p civicrm/l10n
+    cp -r l10n/de_DE civicrm/l10n
+    cp -r sql/civicrm_acl.de_DE.mysql civicrm/sql/civicrm_acl.de_DE.mysql
+    cp -r sql/civicrm_data.de_DE.mysql civicrm/sql/civicrm_data.de_DE.mysql
+    chown -R civicrm:civicrm civicrm/l10n civicrm/sql
 
-rm -rf /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
-su civicrm -c "wp plugin activate civicrm"
-su civicrm -c "cv core:install -vv --keep --db=mysql://$CIVICRM_DB_USER:$CIVICRM_DB_PASS@$CIVICRM_DB_HOST:$CIVICRM_DB_PORT/$CIVICRM_DB_NAME --lang de_DE --comp CiviEvent,CiviMember"
 
-pushd /var/www/html/wp-content/uploads/civicrm
-  mv civicrm.settings.php civicrm.settings.php.generated
-  cp /usr/local/etc/civicrm/civicrm.settings.php civicrm.settings.php
-  chmod a-wx /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
-popd
+  popd
+  rm -rf /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
+  su civicrm -c "wp plugin activate civicrm"
+
+  # TODO: extract module and extension stuff to .env
+  su civicrm -c "cv core:install -vv --keep --db=mysql://$CIVICRM_DB_USER:$CIVICRM_DB_PASS@$CIVICRM_DB_HOST:$CIVICRM_DB_PORT/$CIVICRM_DB_NAME --lang de_DE --comp CiviEvent,CiviMember"
+
+  pushd /var/www/html/wp-content/uploads/civicrm
+    mv civicrm.settings.php civicrm.settings.php.generated
+    cp /usr/local/etc/civicrm/civicrm.settings.php civicrm.settings.php
+    chmod a-wx /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
+    chown civicrm:civicrm ./*
+  popd
+else
+  echo "=== Running Civicrm Upgrade"
+  echo "=== well, not yet"
+  # TODO:
+  # run dump backup
+  # check version specifig upgrade steps: https://docs.civicrm.org/sysadmin/en/latest/upgrade/version-specific/
+  # run upgrade
+  #  cv flush
+fi
 
 echo "=== Running Apache2"
 exec apache2-foreground
\ No newline at end of file