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

prechecked, pull to null, secret volume, rm stopped scheduler

Browse Source
This commit is contained in:
Gyorgy Berenyi
2024-08-29 08:31:40 +02:00
parent 5d04ca0b43
commit a2c540b5d0
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/scheduler/entrypoint.sh
View File

@@ -154,7 +154,8 @@ deploy_additionals(){
sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" $SERVICE_DIR/domain-$NAME.json sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" $SERVICE_DIR/domain-$NAME.json
# start service # start service
$service_exec service-$NAME.json start & debug "$service_exec service-$NAME.json start info prechecked &"
$service_exec service-$NAME.json start info prechecked &
} }
get_repositories(){ get_repositories(){
@@ -171,10 +172,10 @@ get_repositories(){
BASE=$(basename $REPO | cut -d '.' -f1) BASE=$(basename $REPO | cut -d '.' -f1)
if [ ! -d "/tmp/$BASE" ]; then if [ ! -d "/tmp/$BASE" ]; then
git clone $REPO /tmp/$BASE; git clone $REPO /tmp/$BASE > /dev/null;
else else
cd /tmp/$BASE; cd /tmp/$BASE;
git pull; git pull > /dev/null;
fi; fi;
if [ -f "/tmp/$BASE/applications-tree.json" ]; then if [ -f "/tmp/$BASE/applications-tree.json" ]; then
TREES=$TREES" /tmp/$BASE/applications-tree.json" TREES=$TREES" /tmp/$BASE/applications-tree.json"
@@ -207,6 +208,10 @@ check_volumes(){
/usr/bin/docker volume create USER_CONFIG; /usr/bin/docker volume create USER_CONFIG;
RET=0; RET=0;
fi; fi;
if [ ! -d "/etc/user/secret/" ]; then
/usr/bin/docker volume create USER_SECRET;
RET=0;
fi;
echo $RET; echo $RET;
} }
@@ -610,13 +615,15 @@ if [ "$VOL" != "1" ]; then
-v SYSTEM_LOG:/etc/system/log \ -v SYSTEM_LOG:/etc/system/log \
-v USER_DATA:/etc/user/data \ -v USER_DATA:/etc/user/data \
-v USER_CONFIG:/etc/user/config \ -v USER_CONFIG:/etc/user/config \
-v USER_SECRET:/etc/user/secret \
--name $FRAMEWORK_SCHEDULER_NAME \
--env WEBSERVER_PORT=$WEBSERVER_PORT \ --env WEBSERVER_PORT=$WEBSERVER_PORT \
--name $FRAMEWORK_SCHEDULER_NAME \
--network $FRAMEWORK_SCHEDULER_NETWORK \ --network $FRAMEWORK_SCHEDULER_NETWORK \
$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION; $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION;
/usr/bin/docker stop $HOSTNAME; /usr/bin/docker rm -f $HOSTNAME;
fi; fi;
DF=$(check_dirs_and_files); DF=$(check_dirs_and_files);
if [ "$DF" != "1" ]; then if [ "$DF" != "1" ]; then
create_system_json; create_system_json;