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

formatting some elements

Browse Source
This commit is contained in:
gyurix
2024-08-02 11:23:23 +02:00
parent 65bc2e2c16
commit 07accbd24f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/scheduler/entrypoint.sh
View File

@@ -15,7 +15,7 @@ WEB_SERVER=${WEB_SERVER:-webserver}
WEB_IMAGE=${WEB_IMAGE:-web-installer} WEB_IMAGE=${WEB_IMAGE:-web-installer}
WEBSERVER_PORT=${WEBSERVER_PORT:-8080} WEBSERVER_PORT=${WEBSERVER_PORT:-8080}
WEBSERVER_VERSION=${WEBSERVER_VERSION:-latest} WEBSERVER_VERSION=${WEBSERVER_VERSION:-latest}
REDIS_SERVER=${REDIS_SERVER:-redis} REDIS_SERVER=${REDIS_SERVER:-redis-server}
REDIS_PORT=${REDIS_PORT:-6379} REDIS_PORT=${REDIS_PORT:-6379}
REDIS_IMAGE=${REDIS_IMAGE:-redis} REDIS_IMAGE=${REDIS_IMAGE:-redis}
REDIS_VERSION=${REDIS_VERSION:-latest} REDIS_VERSION=${REDIS_VERSION:-latest}
@@ -184,7 +184,7 @@ create_framework_json() {
"containers": [ "containers": [
{ {
"IMAGE": "redis:'$REDIS_VERSION'", "IMAGE": "redis:'$REDIS_VERSION'",
"NAME": "redis-server", "NAME": "'$REDIS_SERVER'",
"UPDATE": "true", "UPDATE": "true",
"MEMORY": "64M", "MEMORY": "64M",
"NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'", "NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'",
@@ -214,7 +214,7 @@ create_framework_json() {
"NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'", "NETWORK": "'$FRAMEWORK_SCHEDULER_NETWORK'",
'$ADDITIONAL', '$ADDITIONAL',
"PORTS":[ "PORTS":[
{ "SOURCE": "8080", { "SOURCE": "'$WEBSERVER_PORT'",
"DEST": "80", "DEST": "80",
"TYPE": "tcp" "TYPE": "tcp"
} }
@@ -291,11 +291,10 @@ if [ "$DF" != "1" ]; then
fi; fi;
echo "$service_exec service-framework.containers.webserver start &";
# 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;
# poll redis infinitely for scheduler jobs # poll redis infinitely for scheduler jobs