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

addtional chnages

Browse Source 
Merge branch 'main' of https://git.format.hu/format/framework-scheduler
This commit is contained in:
gyurix
2024-09-12 14:22:08 +02:00
parent 291abb48cb 30ea45a55f
commit cb20e57d6a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -14,7 +14,7 @@ FROM alpine:latest
COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli
RUN chmod +x /usr/bin/redis-cli RUN chmod +x /usr/bin/redis-cli
RUN apk add --update --no-cache docker-cli wget curl dos2unix jq openssl git openssh-client RUN apk add --update --no-cache docker-cli wget curl dos2unix jq openssl git openssh-client coreutils
COPY scripts/scheduler/*.sh /scripts/ COPY scripts/scheduler/*.sh /scripts/
RUN find ./scripts -name "*.sh" | xargs dos2unix RUN find ./scripts -name "*.sh" | xargs dos2unix

13
scripts/scheduler/entrypoint.sh
View File

@@ -425,8 +425,15 @@ execute_task() {
else else
SEP=""; SEP="";
fi; fi;
SERVICES=$SERVICES$SEP'"'$(cat $SERVICE | jq -r .main.SERVICE_NAME)'": "'$CONTENT'"';
break; 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; fi;
done done
@@ -632,6 +639,8 @@ if [ "$VOL" != "1" ]; then
--env WEBSERVER_PORT=$WEBSERVER_PORT \ --env WEBSERVER_PORT=$WEBSERVER_PORT \
--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;
# --entrypoint=sh \
# $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400';
/usr/bin/docker rm -f $HOSTNAME; /usr/bin/docker rm -f $HOSTNAME;
fi; fi;