From 131982b37f77f32243ad2927bc3b9ae5ef081cc7 Mon Sep 17 00:00:00 2001 From: gyurix Date: Thu, 24 Jul 2025 10:17:23 +0200 Subject: [PATCH 1/2] Refactor upgrade_scheduler function to streamline debug mode handling and simplify Docker start command --- scripts/scheduler/entrypoint.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index d789deb..147f921 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -715,12 +715,10 @@ upgrade_scheduler() { debug "Upgrading framework scheduler..." /usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" - DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" - if [ "$DEBUG_MODE" == "true" ]; then - SET_DEBUG_MODE="--env DEBUG_MODE=true" + DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'" else - SET_DEBUG_MODE="" + DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" fi FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)" @@ -736,7 +734,6 @@ upgrade_scheduler() { -v USER_SECRET:/etc/user/secret \ --restart=always \ --name $FRAMEWORK_SCHEDULER_NAME \ - $SET_DEBUG_MODE \ --env WEBSERVER_PORT=$WEBSERVER_PORT \ --network $FRAMEWORK_SCHEDULER_NETWORK \ --env RUN_FORCE=$RUN_FORCE \ From 550661c2059836eb3293c923cda8869337b1171e Mon Sep 17 00:00:00 2001 From: gyurix Date: Thu, 24 Jul 2025 10:18:54 +0200 Subject: [PATCH 2/2] Add debug mode environment variable handling in upgrade_scheduler function --- scripts/scheduler/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 147f921..0070db6 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -717,8 +717,10 @@ upgrade_scheduler() { if [ "$DEBUG_MODE" == "true" ]; then DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'" + SET_DEBUG_MODE="--env DEBUG_MODE=true" else DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" + SET_DEBUG_MODE="" fi FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)" @@ -734,6 +736,7 @@ upgrade_scheduler() { -v USER_SECRET:/etc/user/secret \ --restart=always \ --name $FRAMEWORK_SCHEDULER_NAME \ + $SET_DEBUG_MODE \ --env WEBSERVER_PORT=$WEBSERVER_PORT \ --network $FRAMEWORK_SCHEDULER_NETWORK \ --env RUN_FORCE=$RUN_FORCE \