3 Commits
1.1.2 ... 1.1.3

Author SHA1 Message Date
gyurix
779f28a5f7 Clean temporary files in shared volume during task execution
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2025-08-13 09:22:38 +02:00
gyurix
9878fa9ce3 Bump version to 1.1.3 in entrypoint script
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2025-08-09 09:54:36 +02:00
gyurix
aeb679a898 Add condition to check for upgrade-framework.json before starting webserver
All checks were successful
continuous-integration/drone/push Build is passing
2025-08-09 09:39:59 +02:00

View File

@@ -3,7 +3,7 @@
cd /scripts
DEBUG_MODE=${DEBUG_MODE:-false}
VERSION="1.1.1"
VERSION="1.1.3"
#DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
@@ -565,6 +565,9 @@ check_volumes() {
if [ ! -d "/var/tmp/shared" ]; then
/usr/bin/docker volume create SHARED
RET=0
else
rm -rf /var/tmp/shared/input/*
rm -rf /var/tmp/shared/output/*
fi
if [ ! -d "/etc/system/data/" ]; then
@@ -1370,11 +1373,6 @@ execute_task() {
upgrade webserver
echo "Upgrading framework scheduler..."
echo "Cleaning temporary files..."
rm -rf /var/tmp/shared/input/*
rm -rf /var/tmp/shared/output/*
upgrade_scheduler
echo "Removing old framework scheduler container..."
JSON_TARGET=$(echo '{"DATE":"'$DATE'","STATUS":2,"VERSION":"'$VERSION'"}' | jq -r . | base64 -w0)
@@ -1508,7 +1506,7 @@ fi
#RS=$(docker ps | grep redis-server)
WS=$(/usr/bin/docker ps | grep -o webserver)
if [ "$WS" == "" ]; then
if [ "$WS" == "" ] && [ ! -f $SHARED/output/upgrade-framework.json ]; then
# START SERVICES
echo "Starting webserver"
$service_exec service-framework.containers.webserver start &