Fix demo docker env

Author: odelaere

.gitignore

@@ -24,8 +24,10 @@ uuid.txt
 share
 config/core.properties
 local
-docker/data/blobstorage/*
-docker/data/filestorage/*
+data/blobstorage/*
+data/filestorage/*
+data/log
+data/async-uuid.txt
 .plone.versioncheck.cache/
 .plone.versioncheck.tracked.json
 checkversion.html

base.cfg

@@ -112,7 +112,7 @@ environment-vars =
   OO_PORT ${port:oo-port}
   PYTHON_UNO ${port:python-uno}
   PUBLIC_URL ${port:public-url}
-  PLONE_EXTENSION_IDS Products.MeetingCommunes:zcity
+  PLONE_EXTENSION_IDS plonetheme.classic:default, plonetheme.sunburst:default, Products.MeetingCommunes:zcity
   DEFAULT_LANGUAGE fr
   ACTIVE_BIGBANG True
   SITE_ID delib

docker/Dockerfile-base

@@ -140,8 +140,7 @@ ENV ZEO_ADDRESS=zeo:8100 \
  OO_PORT=2002 \
  USE_STREAM=False \
  CUSTOM_TMP=/var/tmp \
- ACTIVE_BIGBANG=True \
- SITE_ID=standard
+ ACTIVE_BIGBANG=True
 
 EXPOSE 8081
 ENTRYPOINT ["/plone/docker-entrypoint.sh"]

docker/Dockerfile-demo

@@ -95,8 +95,7 @@ ENV ZEO_ADDRESS=zeo:8100 \
  OO_PORT=2002 \
  USE_STREAM=False \
  CUSTOM_TMP=/var/tmp \
- ACTIVE_BIGBANG=False \
- SITE_ID=standard
+ ACTIVE_BIGBANG=False
 
 EXPOSE 8081
 ENTRYPOINT ["/plone/docker-entrypoint.sh"]

docker/Dockerfile-ubuntu-20.04

@@ -94,8 +94,7 @@ ENV ZEO_ADDRESS=zeo:8100 \
  OO_PORT=2002 \
  USE_STREAM=False \
  CUSTOM_TMP=/var/tmp \
- ACTIVE_BIGBANG=False \
- SITE_ID=standard
+ ACTIVE_BIGBANG=False
 
 EXPOSE 8081
 ENTRYPOINT ["/plone/docker-entrypoint.sh"]

docker/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - tmp:/tmp
       - vartmp:/var/tmp
     networks:
-      - internal
+      - delib_internal
     labels:
       SERVICE_NAME: "libreoffice"
     restart:
@@ -18,31 +18,28 @@ services:
     mem_reservation: 150M
     mem_swappiness: 0
   zeo:
-    image: imiobe/iadelib:4.2.10
+    image: imiobe/iadelib:demo-latest
     command: zeoserver
     environment:
-      - MOUNTPOINT=demo
       - HOSTNAME=zeo
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     networks:
-      - internal
+      - delib_internal
     labels:
       SERVICE_NAME: "zeo"
     healthcheck:
       test: "/plone/zeo_healthcheck.sh"
-#    restart:
-#      unless-stopped
-  instance1:
-    image: imiobe/iadelib:4.2.10
+  instance:
+    image: imiobe/iadelib:demo-latest
     command: instance
     ports:
       - "20081:8081"
     networks:
-      - internal
-      - external
+      - delib_internal
+      - delib_external
     depends_on:
       - zeo
       - libreoffice
@@ -51,107 +48,47 @@ services:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
       - HOSTNAME=instance1
-      - PLONE_PATH=demo/demo
+      - PLONE_PATH=demo
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     healthcheck:
       test: "curl -f localhost:8081/$$PLONE_PATH/@@ok"
     labels:
       SERVICE_NAME: "instance1"
-  instance2:
-    image: imiobe/iadelib:4.2.10
-    command: instance
-    ports:
-      - "20082:8081"
-    networks:
-      - internal
-      - external
-    depends_on:
-      - zeo
-      - libreoffice
-      - worker-cron
-    environment:
-      - ZEO_CLIENT_CACHE_SIZE=1000MB
-      - ZODB_CACHE_SIZE=100000
-      - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
-      - HOSTNAME=instance2
-      - PLONE_PATH=demo/demo
-    volumes:
-      - ../var/:/data
-      - tmp:/tmp
-      - vartmp:/var/tmp
-    healthcheck:
-      test: "curl -f localhost:8081/$$PLONE_PATH/@@ok"
-    labels:
-      SERVICE_NAME: "instance2"
-  instance3:
-    image: imiobe/iadelib:4.2.10
-    command: instance
-    ports:
-      - "20083:8081"
-    networks:
-      - internal
-      - external
-    depends_on:
-      - zeo
-      - libreoffice
-      - worker-cron
-    environment:
-      - ZEO_CLIENT_CACHE_SIZE=1000MB
-      - ZODB_CACHE_SIZE=100000
-      - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
-      - HOSTNAME=instance3
-      - PLONE_PATH=demo/demo
-    healthcheck:
-      test: "curl -f localhost:8081/$$PLONE_PATH/@@ok"
-    volumes:
-      - ../var/:/data
-      - tmp:/tmp
-      - vartmp:/var/tmp
-    labels:
-      SERVICE_NAME: "instance3"
-#    restart:
-#      unless-stopped
   worker-cron:
-    image: imiobe/iadelib:4.2.10
+    image: imiobe/iadelib:demo-latest
     command: instance-cron
     ports:
       - "8087:8087"
     networks:
-      - internal
-      - external
+      - delib_internal
+      - delib_external
     depends_on:
       - zeo
     environment:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=test
       - PUBLIC_URL=http://localhost/PM
-      - PLONE_PATH=demo/demo
+      - PLONE_PATH=demo
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
       - HOSTNAME=worker-cron
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     healthcheck:
       test: "curl -f localhost:8087/$$PLONE_PATH/@@ok"
     labels:
       SERVICE_NAME: "worker-cron"
-#    restart:
-#      unless-stopped
   worker-async:
-    image: imiobe/iadelib:4.2.10
+    image: imiobe/iadelib:demo-latest
     command: instance-async
     networks:
-      - internal
+      - delib_internal
     depends_on:
       - zeo
       - libreoffice
@@ -160,36 +97,32 @@ services:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
       - HOSTNAME=worker-async
-      - PLONE_PATH=demo/demo
+      - PLONE_PATH=demo
     healthcheck:
       test: "curl -f localhost:8089/$$PLONE_PATH/@@ok"
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-async"
-#    restart:
-#      unless-stopped
   worker-amqp:
-    image: imiobe/iadelib:4.2.10
+    image: imiobe/iadelib:demo-latest
     command: instance-amqp
     ports:
       - "20085:8286"
     networks:
-      - internal
-      - external
+      - delib_internal
+      - delib_external
     depends_on:
       - zeo
       - worker-cron
     environment:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
-      - PLONE_PATH=demo/demo
+      - PLONE_PATH=demo
       - MQ_CLIENT_ID
       - MQ_WS_URL
       - MQ_WS_LOGIN
@@ -202,21 +135,19 @@ services:
     healthcheck:
       test: "curl -f localhost:8286/$$PLONE_PATH/@@ok"
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
       SERVICE_NAME: "worker-cron"
-#    restart:
-#      unless-stopped
   maintenance:
-    image: imiobe/iadelib:4.2.10
+    image: imiobe/iadelib:demo-latest
     command: maintenance
     ports:
       - "20089:8080"
     networks:
-      - internal
-      - external
+      - delib_internal
+      - delib_external
     depends_on:
       - zeo
       - libreoffice
@@ -225,13 +156,12 @@ services:
       - ZEO_CLIENT_CACHE_SIZE=1000MB
       - ZODB_CACHE_SIZE=100000
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT=demo
       - HOSTNAME=maintenance
-      - PLONE_PATH=demo/demo
+      - PLONE_PATH=demo
     healthcheck:
       test: "curl -f localhost:8080/$$PLONE_PATH/@@ok"
     volumes:
-      - ../var/:/data
+      - ../data/:/data
       - tmp:/tmp
       - vartmp:/var/tmp
     labels:
@@ -241,6 +171,6 @@ volumes:
   vartmp:
 
 networks:
-  internal:
+  delib_internal:
     internal: true
-  external:
+  delib_external:

docker/docker-entrypoint.sh

@@ -15,7 +15,7 @@ function setup() {
   fi
 }
 function wait_for_cron() {
-  CURL="curl --write-out '%{http_code}' -so /dev/null worker-cron:8087/standard/@@ok"
+  CURL="curl --write-out '%{http_code}' -so /dev/null worker-cron:8087/$PLONE_PATH/@@ok"
   echo "Waiting instance-cron ..."
   sleep 20
   response=$($CURL)
@@ -60,7 +60,9 @@ fi
 
 case "$1" in
 "maintenance")
-  exec "bash"
+  shift
+  echo "Executing maintenance command : $@"
+  exec "$@"
   ;;
 *)
   start "$1"

docker/docker-initialize.py

@@ -47,6 +47,7 @@ def _fix(self, path, activate_big_bang):
         filedata = re.sub(r'path /plone/var/log/instance.*-Z2.log',
                           'path /data/log/' + self.hostname + '-Z2.log',
                           filedata)
+        filedata = re.sub(r'SITE_ID .*', 'SITE_ID ' + self.plone_path, filedata)
         return filedata
 
     def _fix_conf(self, path, activate_big_bang):