Improved collective.big.bang managing

Author: odelaere

base.cfg

@@ -171,6 +171,9 @@ zope-conf-additional =
   ${zope-conf:additional}
   ${zope-conf:amqp}
   ${zope-conf:zamqp}
+environment-vars -=
+    ACTIVE_BIGBANG True
+    ADMIN_PASSWORD ${port:admin-password}
 
 [omelette]
 recipe = collective.recipe.omelette

docker-dev.cfg

@@ -2,29 +2,31 @@
 parts +=
     instance
     instance-cron
+parts -=
+    instance2
+    instance3
+    instance4
+    instance1
 
 [zeoserver]
 file-storage = /data/filestorage/Data.fs
 blob-storage = /data/blobstorage
 zeo-address = zeo:8100
 
-[instance1]
+[instance]
+<= instance1
 blob-storage = /data/blobstorage
 shared-blob = on
 zope-conf-additional =
-  <product-config five.z2monitor>
-     bind 0.0.0.0:${port:instance1-monitor}
-  </product-config>
-  ${zope-conf:additional}
-  ${zope-conf:zamqp}
-eggs +=
-    imio.prometheus
-
-zcml +=
-    imio.prometheus
+    <product-config five.z2monitor>
+       bind 0.0.0.0:${port:instance1-monitor}
+    </product-config>
+    ${zope-conf:additional}
+    ${zope-conf:zamqp}
 environment-vars -=
     ACTIVE_BIGBANG True
     ADMIN_PASSWORD ${port:admin-password}
+
 ; makes shitty json beware
 ;event-log-custom =
 ;    <syslog>
@@ -39,14 +41,15 @@ environment-vars -=
 ;        level INFO
 ;    </logfile>
 
+[instance-amqp]
+blob-storage = /data/blobstorage
+
 [instance-async]
 debug-mode = off
+blob-storage = /data/blobstorage
 environment-vars =
     ZC_ASYNC_UUID /data/async-uuid.txt
 
-[instance]
-<= instance1
-
 [instance-cron]
 <= instance1
 blob-storage = /data/blobstorage
@@ -60,9 +63,3 @@ zope-conf-additional =
       password ${port:admin-password}
   </clock-server>
   ${zope-conf:zamqp}
-eggs +=
-    collective.big.bang
-zcml +=
-    collective.big.bang
-environment-vars +=
-    ACTIVE_BIGBANG True

docker/Dockerfile-ubuntu-20.04

@@ -92,7 +92,7 @@ ENV ZEO_ADDRESS=zeo:8100 \
  OO_PORT=2002 \
  USE_STREAM=False \
  CUSTOM_TMP=/var/tmp \
- ACTIVE_BIGBANG=True \
+ ACTIVE_BIGBANG=False \
  SITE_ID=standard
 
 EXPOSE 8081

docker/docker-compose.yml

@@ -17,7 +17,7 @@ services:
     mem_limit: 200M
     mem_reservation: 150M
   zeo:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: zeoserver
     environment:
       - MOUNTPOINT=demo
@@ -33,7 +33,7 @@ services:
 #    restart:
 #      unless-stopped
   instance1:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance
     ports:
       - "20081:8081"
@@ -47,7 +47,6 @@ services:
     environment:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
-      - ADMIN_PASSWORD=tata
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT=demo
       - HOSTNAME=instance1
@@ -61,7 +60,7 @@ services:
     labels:
       SERVICE_NAME: "instance1"
   instance2:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance
     ports:
       - "20082:8081"
@@ -75,7 +74,6 @@ services:
     environment:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
-      - ADMIN_PASSWORD=tata
       - CLUSTER=iadelib_pm42
       - MOUNTPOINT=demo
       - HOSTNAME=instance2
@@ -89,7 +87,7 @@ services:
     labels:
       SERVICE_NAME: "instance2"
   instance3:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance
     ports:
       - "20083:8081"
@@ -119,7 +117,7 @@ services:
 #    restart:
 #      unless-stopped
   worker-cron:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance-cron
     ports:
       - "8087:8087"
@@ -148,7 +146,7 @@ services:
     restart:
       unless-stopped
   worker-async:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance-async
     networks:
       - internal
@@ -175,7 +173,7 @@ services:
 #    restart:
 #      unless-stopped
   worker-amqp:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     command: instance-amqp
     ports:
       - "20085:8286"
@@ -212,7 +210,7 @@ services:
 #    restart:
 #      unless-stopped
   debug:
-    image: imiobe/iadelib:4.2.9
+    image: imiobe/iadelib:latest
     entrypoint: bash
     ports:
       - "20089:8080"

docker/docker-entrypoint.sh

@@ -4,12 +4,17 @@ set -e
 PRIORIY="instance-cron zeoserver"
 CURL="curl --write-out '%{http_code}' -so /dev/null worker-cron:8087/standard/@@ok"
 
-mkdir -p -m 777 /data/{log,instance-debug,filestorage,blobstorage,instance-async,instance-amqp,instance1}
+mkdir -p -m 777 /data/{log,filestorage,blobstorage}
 python docker-initialize.py
 
+if [[ $MOUNTPOINT ]]
+then
+  mkdir -p -m 777 "/data/blobstorage-$MOUNTPOINT"
+fi
+
 if [[ "instance" == "$1" || ! $PRIORIY == *"$1"* ]]
 then
-  echo "Wating instance-cron ..."
+  echo "Waiting instance-cron ..."
   sleep 20
   response=$($CURL)
   echo "received response  $response"
@@ -21,6 +26,13 @@ then
     echo "received response  $response"
   done
 fi
+
+if [[ "instance-cron" == "$1" ]]
+then
+  echo "Setting ACTIVE_BIGBANG"
+  export ACTIVE_BIGBANG="True"
+fi
+
 echo "Starting $1"
 exec "bin/python" "bin/$1" "fg"
 

prod.cfg

@@ -22,6 +22,7 @@ zope-conf-additional =
   ${zope-conf:zamqp}
 environment-vars -=
     ACTIVE_BIGBANG True
+    ADMIN_PASSWORD ${port:admin-password}
 
 [instance3]
 <= instance2