Skip to content

Commit

Permalink
Fix ADMIN_PASSWORD docker management
Browse files Browse the repository at this point in the history
  • Loading branch information
odelaere committed Jun 1, 2022
1 parent ff259ac commit 364b811
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
3 changes: 0 additions & 3 deletions docker-dev.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions docker/docker-initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 364b811

Please sign in to comment.