From b0b892644ae584086f25bde23ea8de7ea513f1c8 Mon Sep 17 00:00:00 2001 From: Jose Javier Merchante Date: Tue, 3 Sep 2024 17:00:03 +0200 Subject: [PATCH] Updated the worker image to load custom settings. The worker container was not loading the custom settings due to the environment variable was being replaced. Signed-off-by: Jose Javier Merchante --- docker/server-entrypoint.sh | 2 +- docker/worker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/server-entrypoint.sh b/docker/server-entrypoint.sh index ccde0e41..f7d668b9 100755 --- a/docker/server-entrypoint.sh +++ b/docker/server-entrypoint.sh @@ -45,7 +45,7 @@ source /opt/venv/bin/activate set -e # Default configuration -export SORTINGHAT_CONFIG=sortinghat.config.settings +export SORTINGHAT_CONFIG="${SORTINGHAT_CONFIG:-sortinghat.config.settings}" sortinghat_check_service() { django-admin check --settings=$SORTINGHAT_CONFIG --database default > /dev/null 2>&1 diff --git a/docker/worker-entrypoint.sh b/docker/worker-entrypoint.sh index 018c6144..3b167625 100755 --- a/docker/worker-entrypoint.sh +++ b/docker/worker-entrypoint.sh @@ -31,7 +31,7 @@ source /opt/venv/bin/activate set -e # Default configuration -export SORTINGHAT_CONFIG=sortinghat.config.settings +export SORTINGHAT_CONFIG="${SORTINGHAT_CONFIG:-sortinghat.config.settings}" # Build the command to run set - sortinghatw "$@"