Fix ADMIN_PASSWORD docker management

Author: odelaere

docker-dev.cfg

@@ -53,8 +53,5 @@ zope-conf-additional =
 
 environment-vars += ${bigbang:environment-vars}
 
-# remove ADMIN_PASSWORD because it should be given by compose file
-environment-vars -= ADMIN_PASSWORD ${port:admin-password}
-
 [instance-debug]
 blob-storage = /data/blobstorage

docker/docker-entrypoint.sh

@@ -8,11 +8,6 @@ function setup() {
   if [[ $MOUNTPOINT ]]; then
     mkdir -pv "/data/blobstorage-$MOUNTPOINT"
   fi
-
-  if [[ "instance-cron" == "$1" ]]; then
-    echo "Setting ACTIVE_BIGBANG"
-    export ACTIVE_BIGBANG="True"
-  fi
   chmod 777 /data/*
 }
 function wait_for_cron() {

docker/docker-initialize.py

@@ -53,6 +53,7 @@ def _fix(self, path, activate_big_bang):
     def _fix_conf(self, path, activate_big_bang):
         filedata = self._fix(path, activate_big_bang)
         filedata = re.sub(r'password.*?admin', 'password ' + self.admin_password, filedata)
+        filedata = re.sub(r'ADMIN_PASSWORD.*?admin', 'ADMIN_PASSWORD ' + self.admin_password, filedata)
         with open(path, 'w') as file:
             file.write(filedata)