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

changed order of directories checks

Browse Source
This commit is contained in:
gyurix
2024-11-28 08:40:09 +01:00
parent 3cedddf5c3
commit df9afff68c
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/scheduler/entrypoint.sh
View File

@@ -253,11 +253,11 @@ check_dirs_and_files() {
setfacl -d -m g:65534:rw /var/tmp/shared setfacl -d -m g:65534:rw /var/tmp/shared
if [ ! -d "/etc/user/config/services/" ]; then if [ ! -d "/etc/user/config/services/" ]; then
mkdir /etc/user/config/services/ mkdir -p /etc/user/config/services/
fi fi
if [ ! -d "/etc/user/config/services/tmp/" ]; then if [ ! -d "/etc/user/config/services/tmp/" ]; then
mkdir /etc/user/config/services/tmp/ mkdir -p /etc/user/config/services/tmp/
if [[ -f "/etc/user/config/system.json" && -f "/etc/user/config/user.json" ]]; then if [[ -f "/etc/user/config/system.json" && -f "/etc/user/config/user.json" ]]; then
RET=1 RET=1
@@ -265,7 +265,7 @@ check_dirs_and_files() {
fi fi
if [ ! -d "/etc/system" ]; then if [ ! -d "/etc/system" ]; then
mkdir "/etc/system" mkdir -p"/etc/system"
fi fi
if [ ! -d "/etc/user/secret" ]; then if [ ! -d "/etc/user/secret" ]; then
@@ -909,17 +909,16 @@ if [ "$STATUS" != "1" ]; then
/usr/bin/docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_SCHEDULER_NETWORK_SUBNET /usr/bin/docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_SCHEDULER_NETWORK_SUBNET
fi fi
DF=$(check_dirs_and_files) VOL=$(check_volumes)
if [ "$DF" != "1" ]; then if [ "$VOL" != "1" ]; then
DF=$(check_dirs_and_files)
if [ "$DF" != "1" ]; then
create_system_json create_system_json
create_user_json create_user_json
create_framework_json create_framework_json
fi
VOL=$(check_volumes)
if [ "$VOL" != "1" ]; then
start_framework_scheduler start_framework_scheduler
/usr/bin/docker rm -f $HOSTNAME /usr/bin/docker rm -f $HOSTNAME
fi
fi fi
RS=$(docker ps | grep redis-server) RS=$(docker ps | grep redis-server)