From dc530e1b123f5d3968114556aafea708c4606c89 Mon Sep 17 00:00:00 2001 From: gyurix Date: Thu, 21 Nov 2024 21:28:08 +0100 Subject: [PATCH] revert framework scheduler starting method --- scripts/scheduler/entrypoint.sh | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 53c6273..b27ffb7 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -861,6 +861,32 @@ check_redis_availability() { done } +start_framework_scheduler() { + + if [ "$DEBUG_MODE" == "true" ]; then + DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'" + else + DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" + fi + DOCKER_RUN="/usr/bin/docker run -d \ + -v $SHARED_DIR:/var/tmp/shared \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v SYSTEM_DATA:/etc/system/data \ + -v SYSTEM_CONFIG:/etc/system/config \ + -v SYSTEM_LOG:/etc/system/log \ + -v USER_DATA:/etc/user/data \ + -v USER_CONFIG:/etc/user/config \ + -v USER_SECRET:/etc/user/secret \ + --restart=always \ + --name $FRAMEWORK_SCHEDULER_NAME \ + --env WEBSERVER_PORT=$WEBSERVER_PORT \ + --network $FRAMEWORK_SCHEDULER_NETWORK \ + --env RUN_FORCE=$RUN_FORCE \ + $DOCKER_START" + eval "$DOCKER_RUN" + +} + ### SYSTEM INITIALIZATION ### ## DOCKER NETWORK VARIABLES @@ -890,7 +916,7 @@ fi VOL=$(check_volumes) if [ "$VOL" != "1" ]; then - $service_exec service-framework.containers.$FRAMEWORK_SCHEDULER_NAME start + start_framework_scheduler /usr/bin/docker rm -f $HOSTNAME fi