Handle zeo packing

Author: odelaere

docker/Dockerfile-base

@@ -94,7 +94,7 @@ COPY --from=builder /usr/local/include/zint.h /usr/local/include/
 COPY --from=builder /usr/local/bin/zint /usr/local/bin/
 
 COPY --chown=imio --from=builder /plone /plone/
-COPY --chown=imio docker/docker-initialize.py docker/docker-entrypoint.sh docker/pack_zeo.sh docker/update-admin-password.py /plone/
+COPY --chown=imio docker/docker-initialize.py docker/*.sh /plone/
 
 WORKDIR /plone
 USER root

docker/Dockerfile-ubuntu-20.04

@@ -83,8 +83,7 @@ LABEL delib=$DELIB_VERSION \
 COPY --from=builder /usr/local/lib/python2.7/dist-packages /usr/local/lib/python2.7/dist-packages
 
 COPY --chown=imio --from=builder /plone /plone/
-COPY --chown=imio docker/docker-initialize.py docker/docker-entrypoint.sh docker/update-admin-password.py /plone/
-
+COPY --chown=imio docker/docker-initialize.py docker/*.sh /plone/
 WORKDIR /plone
 USER imio
 

docker/docker-compose.yml

@@ -20,7 +20,7 @@ services:
     image: imiobe/iadelib:4.2.9
     command: zeoserver
     environment:
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=zeo
     volumes:
       - ../var/:/data
@@ -49,7 +49,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=instance1
     volumes:
       - ../var/:/data
@@ -74,7 +74,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=instance2
     volumes:
       - ../var/:/data
@@ -99,7 +99,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=instance3
     volumes:
       - ../var/:/data
@@ -126,7 +126,7 @@ services:
       - PUBLIC_URL=http://localhost/PM
       - PLONE_PATH=PM
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=worker-cron
     volumes:
       - ../var/:/data
@@ -150,7 +150,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=worker-async
     volumes:
       - ../var/:/data
@@ -176,7 +176,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=Trololo
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - PLONE_PATH
       - MQ_CLIENT_ID
       - MQ_WS_URL
@@ -212,7 +212,7 @@ services:
       - ZODB_CACHE_SIZE=100000
       - ADMIN_PASSWORD=admin
       - CLUSTER=iadelib_pm42
-      - MOUNTPOINT
+      - MOUNTPOINT=demo
       - HOSTNAME=debug
     volumes:
       - ../var/:/data

docker/pack_zeo.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
 echo "----------Start of Databases packing $(date --rfc-2822)----------"
-
+echo
 CMD="/plone/bin/python /plone/bin/zeopack"
 echo "Executing $CMD"
 eval "$CMD"
 
-if [[ -v "$($MOUNTPOINT)" ]]
+if [ "$MOUNTPOINT" ]
 then
-  echo "Found mountpoint = $($MOUNTPOINT)"
-  CMD="/plone/bin/python /plone/bin/zeopack -S $($MOUNTPOINT) -B /data/blobstorage-$($MOUNTPOINT)"
+  echo "Found mountpoint = $MOUNTPOINT"
+  CMD="/plone/bin/python /plone/bin/zeopack -S $MOUNTPOINT -B /data/blobstorage-$MOUNTPOINT"
   echo "Executing $CMD"
   eval "$CMD"
+else
+  echo "Mountpoint not found"
 fi
-
+echo
 echo "----------End of Databases packing $(date --rfc-2822)----------"