diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index dacc973..2bf7da9 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -498,7 +498,10 @@ execute_task() { CONTAINER_NAMES=$(cat $SERVICE | jq -r .containers[].NAME); CONTAINERS=""; for CONTAINER_NAME in $CONTAINER_NAMES; do - CONTAINERS="$CONTAINERS "$(docker ps --format '{{.Names}}:{{.Status}}' | grep -v framework-scheduler | grep "$CONTAINER_NAME"); + if [ "$CONTAINERS" != "" ]; then + CONTAINERS=$CONTAINERS"|"; + fi + CONTAINERS="$CONTAINERS"$(docker ps --format '{{.Names}}:{{.Status}}' | grep -v framework-scheduler | grep "$CONTAINER_NAME"); done; #RESULT=$(echo "$CONTAINERS" | base64 -w0); SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}'; @@ -527,7 +530,10 @@ execute_task() { 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"); + if [ "$CONTAINERS" != "" ]; then + CONTAINERS=$CONTAINERS"|"; + fi; + CONTAINERS="$CONTAINERS"$(docker ps --format '{{.Names}}:{{.Status}}' | grep -v framework-scheduler | grep "$CONTAINER_NAME"); done; #RESULT=$(echo "$CONTAINERS" | base64 -w0); SERVICES=$SERVICES$SEP'"'$SERVICE_NAME'": {"content": "'$CONTENT'", "running": "'$CONTAINERS'"}';