Update docker cron config

IMIO · May 10, 2022 · 9c3d22e · 9c3d22e
1 parent 9839792
commit 9c3d22e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/docker-dev.cfg b/docker-dev.cfg
@@ -52,9 +52,7 @@ zope-conf-additional =
   ${zope-conf:zamqp}
 
 environment-vars +=
-    ACTIVE_BIGBANG True
-    PLONE_EXTENSION_IDS plonetheme.classic:default, plonetheme.sunburst:default, Products.MeetingCommunes:zcity
-    DEFAULT_LANGUAGE fr
+    environment-vars += ${bigbang:environment-vars}
 
 [instance-debug]
 blob-storage = /data/blobstorage
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
     environment:
       - HOSTNAME=zeo
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     networks:
@@ -51,7 +51,7 @@ services:
       - HOSTNAME=instance1
       - PLONE_PATH=demo
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     healthcheck:
@@ -77,7 +77,7 @@ services:
       - CLUSTER=iadelib_pm42
       - HOSTNAME=worker-cron
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     healthcheck:
@@ -101,7 +101,7 @@ services:
     healthcheck:
       test: "curl -f localhost:8089/$$PLONE_PATH/@@ok"
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
@@ -134,14 +134,15 @@ services:
     healthcheck:
       test: "curl -f localhost:8286/$$PLONE_PATH/@@ok"
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-cron"
   maintenance:
     image: imiobe/iadelib:demo-latest
-    command: maintenance
+    # command: maintenance
+    entrypoint: bash
     ports:
       - "20089:8080"
     networks:
@@ -160,14 +161,15 @@ services:
     healthcheck:
       test: "curl -f localhost:8080/$$PLONE_PATH/@@ok"
     volumes:
-      - ./data/:/data
+      - data:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "maintenance"
 volumes:
   tmp:
   vartmp:
+  data:
 
 networks:
   delib_internal:

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -18,14 +18,15 @@ function wait_for_cron() {
   echo "Waiting for cron"
   URL="worker-cron:8087/$PLONE_PATH"
   CURL="curl --write-out %{http_code} -so /dev/null $URL/@@ok"
-  MAX_TRIES=240
-  INTERVAL=1
+  MAX_TRIES=250
+  INTERVAL=5
   set +e
   SECONDS=0
   response="$($CURL)"
   tries=1
   while [[ $response != "200" && $tries -lt $MAX_TRIES ]]
   do
+    echo "Waiting for cron"
     sleep $INTERVAL
     response=$($CURL)
     ((tries+=1))
@@ -72,7 +73,7 @@ fi
 case "$1" in
 "maintenance")
   shift
-  echo "Executing maintenance command : $@"
+  echo "Executing maintenance command : '$*'"
   exec "$@"
   ;;
 *)

diff --git a/scripts/copy-data.sh b/scripts/copy-data.sh
@@ -4,7 +4,7 @@ for i in "$@"; do
   case $i in
   -s=* | --server=*)
     echo "source found ${i#*=}"
-    SOURCE_HOST="${i#*=}.imio.be"
+    SOURCE_HOST="${i#*=}"
     shift # past argument=value
     ;;
   -b=* | --buildout=*)