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

This commit is contained in:
2024-09-13 13:49:11 +02:00

View File

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