From d1c86f681dcbdcc7a9c98ffd34d0a423deca051a Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-6AP4J8U>
Date: Fri, 13 Sep 2024 12:22:26 +0200
Subject: [PATCH 1/2] firewalls

---
 scripts/scheduler/entrypoint.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh
index ae3f299..f3cdc26 100644
--- a/scripts/scheduler/entrypoint.sh
+++ b/scripts/scheduler/entrypoint.sh
@@ -429,13 +429,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
 

From 615a928a35505f8bb7bbecff3dfcb75f920409f6 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-6AP4J8U>
Date: Fri, 13 Sep 2024 13:47:14 +0200
Subject: [PATCH 2/2] system containers

---
 scripts/scheduler/entrypoint.sh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh
index f3cdc26..cb44128 100644
--- a/scripts/scheduler/entrypoint.sh
+++ b/scripts/scheduler/entrypoint.sh
@@ -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);