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

Compare commits

base: safebox:bc7d30ea595903f688d18c0b641aeef970432e8a
Branches Tags
safebox:main
safebox:1.1.5 safebox:1.1.4 safebox:1.1.3 safebox:1.1.2 safebox:1.1.1 safebox:1.1.0 safebox:1.0.9 safebox:1.0.8 safebox:1.0.7 safebox:1.0.6 safebox:1.0.5 safebox:1.0.4 safebox:1.0.3 safebox:1.0.2 safebox:1.0.1 safebox:latest
...
compare: safebox:1.0.4
Branches Tags
safebox:main
safebox:1.1.5 safebox:1.1.4 safebox:1.1.3 safebox:1.1.2 safebox:1.1.1 safebox:1.1.0 safebox:1.0.9 safebox:1.0.8 safebox:1.0.7 safebox:1.0.6 safebox:1.0.5 safebox:1.0.4 safebox:1.0.3 safebox:1.0.2 safebox:1.0.1 safebox:latest

4 Commits
bc7d30ea59 ... 1.0.4

Author SHA1 Message Date
gyurix
933d182244 Reorder upgrade calls in entrypoint script for framework and web-installer
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2025-05-21 11:07:50 +02:00
Gyorgy Berenyi
153249211a Update Dockerfile
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-05-21 09:07:24 +00:00
laci
c5765ca952 Merge branch 'main' of https://git.format.hu/safebox/framework-scheduler
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-05-15 13:25:48 +00:00
laci
2bcf430dfd upgrade debug 2025-05-15 13:25:02 +00:00
2 changed files with 6 additions and 4 deletions
Expand all files Collapse all files

2
Dockerfile
View File

@@ -20,4 +20,4 @@ COPY scripts/scheduler/*.sh /scripts/
RUN find ./scripts -name "*.sh" | xargs dos2unix RUN find ./scripts -name "*.sh" | xargs dos2unix
RUN ["chmod", "+x", "-R", "/scripts/"] RUN ["chmod", "+x", "-R", "/scripts/"]
ENTRYPOINT ["/scripts/entrypoint.sh"] CMD /scripts/entrypoint.sh

8
scripts/scheduler/entrypoint.sh
View File

@@ -607,14 +607,16 @@ upgrade() {
if [ "$NAME" == "web-installer" ]; then if [ "$NAME" == "web-installer" ]; then
debug "$service_exec service-framework.containers.webserver start info" debug "$service_exec service-framework.containers.webserver stop force"
$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 & $service_exec service-framework.containers.webserver start info &
else else
debug "$service_exec $NAME.json start info" 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"
$service_exec $NAME.json start info & $service_exec $NAME.json start info &
fi fi
PID=$! PID=$!
@@ -967,8 +969,8 @@ 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_scheduler
upgrade "web-installer" upgrade "web-installer"
upgrade_scheduler
#CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -E 'framework-scheduler|webserver') #CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -E 'framework-scheduler|webserver')
else else
upgrade "$NAME" upgrade "$NAME"