safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

restart=always test

Browse Source
This commit is contained in:
Gyorgy Berenyi
2024-09-27 13:20:23 +02:00
parent 80cd01b578
commit 49b6473c6a
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/scheduler/entrypoint.sh
View File

@@ -1,7 +1,6 @@
#! /bin/sh #! /bin/sh
cd /scripts cd /scripts
DEBUG_MODE=${DEBUG_MODE:-false} DEBUG_MODE=${DEBUG_MODE:-false}
DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu} DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
@@ -322,7 +321,7 @@ create_user_json() {
create_framework_json() { create_framework_json() {
ADDITIONAL="" ADDITIONAL=""
ADDITIONAL='"EXTRA": "--label logging=promtail_user --label logging_jobname=containers --restart unless-stopped", "PRE_START": [], "DEPEND": [], "CMD": ""' ADDITIONAL='"EXTRA": "--label logging=promtail_user --label logging_jobname=containers --restart always", "PRE_START": [], "DEPEND": [], "CMD": ""'
echo '{ echo '{
"main": { "main": {
@@ -782,13 +781,14 @@ if [ "$VOL" != "1" ]; then
-v USER_DATA:/etc/user/data \ -v USER_DATA:/etc/user/data \
-v USER_CONFIG:/etc/user/config \ -v USER_CONFIG:/etc/user/config \
-v USER_SECRET:/etc/user/secret \ -v USER_SECRET:/etc/user/secret \
--restart=always \
--name $FRAMEWORK_SCHEDULER_NAME \ --name $FRAMEWORK_SCHEDULER_NAME \
--env WEBSERVER_PORT=$WEBSERVER_PORT \ --env WEBSERVER_PORT=$WEBSERVER_PORT \
--network $FRAMEWORK_SCHEDULER_NETWORK \ --network $FRAMEWORK_SCHEDULER_NETWORK \
--env RUN_FORCE=$RUN_FORCE \ --env RUN_FORCE=$RUN_FORCE \
$DOCKER_START"; $DOCKER_START";
eval "$DOCKER_RUN"; eval "$DOCKER_RUN";
/usr/bin/docker rm -f $HOSTNAME; #/usr/bin/docker rm -f $HOSTNAME;
fi; fi;
@@ -799,11 +799,18 @@ if [ "$DF" != "1" ]; then
create_framework_json; create_framework_json;
fi; fi;
RS=$(docker ps |grep redis-server);
WS=$(docker ps |grep webserver);
if [[ "$WS" == "" && "$RS" == "" ]]; then
# START SERVICES # START SERVICES
$service_exec service-framework.containers.redis-server start & $service_exec service-framework.containers.redis-server start &
$service_exec service-framework.containers.webserver start & $service_exec service-framework.containers.webserver start &
sleep 5; sleep 5;
fi
# poll redis infinitely for scheduler jobs # poll redis infinitely for scheduler jobs
check_redis_availability $REDIS_SERVER $REDIS_PORT $CURL_RETRIES $CURL_SLEEP_SHORT check_redis_availability $REDIS_SERVER $REDIS_PORT $CURL_RETRIES $CURL_SLEEP_SHORT