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

Merge branch 'main' of ssh://git.format.hu/format/framework-scheduler

Browse Source
This commit is contained in:
Gyorgy Berenyi
2024-09-13 13:49:11 +02:00
parent e47168b796 615a928a35
commit 161641c317
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/scheduler/entrypoint.sh
View File

@@ -397,18 +397,24 @@ execute_task() {
INSTALLED_SERVICES=$(ls /etc/user/config/services/*.json );
SERVICES="";
for SERVICE in $(echo $INSTALLED_SERVICES); do
for ITEM in $SYSTEM_LIST; do
if [ "$(basename $SERVICE)" == "$ITEM" ]; then # system file
CONTENT=$(cat $SERVICE | base64 -w0);
if [ "$SERVICES" != "" ]; then
SEP=",";
else
SEP="";
fi;
SERVICES=$SERVICES$SEP'"'$(cat $SERVICE | jq -r .main.SERVICE_NAME)'": "'$CONTENT'"';
break;
X=$(echo $SYSTEM_LIST | grep -w "$(basename $SERVICE)");
if [ "$X" != "" ]; then # is is a system file
CONTENT=$(cat $SERVICE | base64 -w0);
if [ "$SERVICES" != "" ]; then
SEP=",";
else
SEP="";
fi;
done;
SERVICE_NAME=$(cat $SERVICE | jq -r .main.SERVICE_NAME);
CONTAINER_NAMES=$(cat $SERVICE | jq -r .containers[].NAME);
CONTAINERS="";
for CONTAINER_NAME in "$CONTAINER_NAMES"; do
CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}' | grep -v framework-scheduler | grep $CONTAINER_NAME);
done;
#RESULT=$(echo "$CONTAINERS" | base64 -w0);
SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}';
fi;
done
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "INSTALL_STATUS": "'$INSTALL_STATUS'", "INSTALLED_SERVICES": {'$SERVICES'} }' | jq -r . | base64 -w0);
@@ -429,13 +435,15 @@ execute_task() {
fi;
SERVICE_NAME=$(cat $SERVICE | jq -r .main.SERVICE_NAME);
CONTAINER_NAMES=$(cat $SERVICE | jq -r .containers[].NAME);
CONTAINERS="";
for CONTAINER_NAME in "$CONTAINER_NAMES"; do
CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}' | grep -v framework-scheduler | grep $CONTAINER_NAME);
done;
#RESULT=$(echo "$CONTAINERS" | base64 -w0);
SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}';
if [ "$SERVICE_NAME" != "firewalls" ]; then
CONTAINER_NAMES=$(cat $SERVICE | jq -r .containers[].NAME);
CONTAINERS="";
for CONTAINER_NAME in "$CONTAINER_NAMES"; do
CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}' | grep -v framework-scheduler | grep $CONTAINER_NAME);
done;
#RESULT=$(echo "$CONTAINERS" | base64 -w0);
SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}';
fi;
fi;
done