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

Refactor upgrade function to simplify web-installer handling and streamline service start process
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
gyurix
2025-07-23 15:57:52 +02:00
parent 3c1e396b19
commit 2e0129402d
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/scheduler/entrypoint.sh
View File

@@ -732,20 +732,11 @@ upgrade_scheduler() {
upgrade() { upgrade() {
local NAME=$1 local NAME=$1
if [ "$NAME" == "web-installer" ]; then
debug "$service_exec service-framework.containers.webserver stop force"
$service_exec service-framework.containers.webserver stop force
debug "$service_exec service-framework.containers.webserver start info"
$service_exec service-framework.containers.webserver start info &
else
debug "$service_exec $NAME.json stop force" debug "$service_exec $NAME.json stop force"
$service_exec $NAME.json stop force $service_exec $NAME.json stop force
debug "$service_exec $NAME.json start info" debug "$service_exec $NAME.json start info"
$service_exec $NAME.json start info & $service_exec $NAME.json start info &
fi
PID=$! PID=$!
} }
@@ -1161,7 +1152,7 @@ execute_task() {
JSON="$(echo $B64_JSON | base64 -d)" JSON="$(echo $B64_JSON | base64 -d)"
NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}') NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}')
if [ "$NAME" == "framework" ]; then if [ "$NAME" == "framework" ]; then
upgrade "web-installer"
upgrade_scheduler upgrade_scheduler
/usr/bin/docker rm -f $HOSTNAME /usr/bin/docker rm -f $HOSTNAME
@@ -1288,15 +1279,12 @@ if [ "$DF" != "1" ]; then
fi fi
#RS=$(docker ps | grep redis-server) #RS=$(docker ps | grep redis-server)
WS=$(docker ps | grep webserver) WS=$(/usr/bin/docker ps | grep -o webserver)
#if [[ "$WS" == "" && "$RS" == "" ]]; then
if [ "$WS" == "" ]; then if [ "$WS" == "" ]; then
# START SERVICES # START SERVICES
#$service_exec service-framework.containers.redis-server start & echo "Starting webserver"
$service_exec service-framework.containers.webserver start & $service_exec service-framework.containers.webserver start &
sleep 5
fi fi