From e673eb6dc837fbdf803bd355f90c2b230b5891af Mon Sep 17 00:00:00 2001 From: gyurix Date: Thu, 28 Nov 2024 08:53:53 +0100 Subject: [PATCH] changed order of volumes and directories creating at first time --- scripts/scheduler/entrypoint.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 20b9797..eacba69 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -229,7 +229,6 @@ check_volumes() { /usr/bin/docker volume create USER_SECRET RET=0 fi - echo $RET } @@ -271,7 +270,6 @@ check_dirs_and_files() { if [ ! -d "/etc/user/secret" ]; then mkdir -p "/etc/user/secret" fi - echo $RET } @@ -896,14 +894,15 @@ fi VOL=$(check_volumes) if [ "$VOL" != "1" ]; then - DF=$(check_dirs_and_files) - if [ "$DF" != "1" ]; then - create_system_json - create_user_json - create_framework_json - start_framework_scheduler - /usr/bin/docker rm -f $HOSTNAME - fi + start_framework_scheduler + /usr/bin/docker rm -f $HOSTNAME +fi + +DF=$(check_dirs_and_files) +if [ "$DF" != "1" ]; then + create_system_json + create_user_json + create_framework_json fi #RS=$(docker ps | grep redis-server)