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

mod

Browse Source
This commit is contained in:
hael
2024-07-24 14:37:48 +00:00
parent 337498f444
commit d8f76a64ba
1 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/scheduler/entrypoint.sh
View File

@@ -5,7 +5,8 @@ cd /scripts
DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu} DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
USER_INIT_PATH=$USER_INIT_PATH USER_INIT_PATH=$USER_INIT_PATH
FRAMWEORK_SCHEDULER_NAME=${FRAMEWORK_SCHEDULER_NAME:-framework-scheduler} FRAMEWORK_SCHEDULER_IMAGE=${FRAMEWORK_SCHEDULER_IMAGE:-framework-scheduler}
FRAMEWORK_SCHEDULER_NAME=${FRAMEWORK_SCHEDULER_NAME:-framework-scheduler}
FRAMEWORK_SCHEDULER_NETWORK=${FRAMEWORK_SCHEDULER_NETWORK:-framework-network} FRAMEWORK_SCHEDULER_NETWORK=${FRAMEWORK_SCHEDULER_NETWORK:-framework-network}
FRAMEWORK_NETWORK_SUBNET=${FRAMEWORK_NETWORK_SUBNET:-"172.18.255.0/24"} FRAMEWORK_NETWORK_SUBNET=${FRAMEWORK_NETWORK_SUBNET:-"172.18.255.0/24"}
@@ -39,16 +40,15 @@ scheduler_manager(){
FRAMEWORK_SUBNET=$3; FRAMEWORK_SUBNET=$3;
FRAMEWORK_UPDATE=$4; FRAMEWORK_UPDATE=$4;
# TODO service exec json
if [ "$FRAMEWORK_NETWORK" == "0" ]; then if [ "$FRAMEWORK_NETWORK" == "0" ]; then
echo "Restarting the scheduler with the correct network" echo "Restarting the scheduler with the correct network"
docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_NETWORK_SUBNET docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_NETWORK_SUBNET
fi;
if [ "$FRAMEWORK_SUBNET" == "0" ]; then if [ "$FRAMEWORK_SUBNET" == "0" ]; then
echo "Restarting the scheduler with the correct subnet" echo "Creating network $FRAMEWORK_SCHEDULER_NETWORK"
docker stop $ACTUAL_FRAMEWORK_SCHEDULER_NAME docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_NETWORK_SUBNET
docker rm $ACTUAL_FRAMEWORK_SCHEDULER_NAME
docker run -d --name $FRAMEWORK_SCHEDULER_NAME --network $FRAMEWORK_SCHEDULER_NETWORK --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /scripts:/scripts $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_NAME
fi fi
if [ "$FRAMEWORK_NAME" == "0" ]; then if [ "$FRAMEWORK_NAME" == "0" ]; then
@@ -58,10 +58,6 @@ scheduler_manager(){
docker run -d --name $FRAMEWORK_SCHEDULER_NAME --network $FRAMEWORK_SCHEDULER_NETWORK --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /scripts:/scripts $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_NAME docker run -d --name $FRAMEWORK_SCHEDULER_NAME --network $FRAMEWORK_SCHEDULER_NETWORK --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /scripts:/scripts $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_NAME
fi fi
if [ "$FRAMEWORK_UPDATE" == "0" ]; then if [ "$FRAMEWORK_UPDATE" == "0" ]; then
echo "Restarting the scheduler with the correct version" echo "Restarting the scheduler with the correct version"
docker stop $ACTUAL_FRAMEWORK_SCHEDULER_NAME docker stop $ACTUAL_FRAMEWORK_SCHEDULER_NAME
@@ -69,8 +65,6 @@ scheduler_manager(){
docker run -d --name $FRAMEWORK_SCHEDULER_NAME --network $FRAMEWORK_SCHEDULER_NETWORK --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /scripts:/scripts $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_NAME docker run -d --name $FRAMEWORK_SCHEDULER_NAME --network $FRAMEWORK_SCHEDULER_NETWORK --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /scripts:/scripts $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_NAME
fi fi
} }
check_framework_scheduler_status(){ check_framework_scheduler_status(){
@@ -88,23 +82,14 @@ check_framework_scheduler_status(){
if [ "$(docker network inspect $FRAMEWORK_SCHEDULER_NETWORK --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}')" == "$FRAMEWORK_NETWORK_SUBNET" ]; then if [ "$(docker network inspect $FRAMEWORK_SCHEDULER_NETWORK --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}')" == "$FRAMEWORK_NETWORK_SUBNET" ]; then
echo "Network $FRAMEWORK_SCHEDULER_NETWORK is available with the correct subnet, not needed to restart the scheduler" echo "Network $FRAMEWORK_SCHEDULER_NETWORK is available with the correct subnet, not needed to restart the scheduler"
check_framework_network_availabity
else else
check_framework_subnet_availabity
FRAMEWORK_SUBNET=0; FRAMEWORK_SUBNET=0;
fi fi
else else
FRAMEWORK_NETWORK=0; FRAMEWORK_NETWORK=0;
fi fi
if [ ]; then
else
FRAMEWORK_UPDATE=0;
fi
scheduler_manager $FRAMEWORK_NAME $FRAMEWORK_NETWORK $FRAMEWORK_SUBNET $FRAMEWORK_UPDATE scheduler_manager $FRAMEWORK_NAME $FRAMEWORK_NETWORK $FRAMEWORK_SUBNET $FRAMEWORK_UPDATE
#echo '{"FRAMEWORK_NAME": "$FRAMEWORK_NAME", "FRAMEWORK_NETWORK": "$FRAMEWORK_NETWORK"}' #echo '{"FRAMEWORK_NAME": "$FRAMEWORK_NAME", "FRAMEWORK_NETWORK": "$FRAMEWORK_NETWORK"}'
@@ -112,8 +97,7 @@ check_framework_scheduler_status(){
} }
check_framework_network_availabity() { check_framework_subnet_availabity() {
if [ -z "$(docker network ls --filter name=^$FRAMEWORK_SCHEDULER_NETWORK$ --format {{.Name}})" ]; then
# Define the subnet you want to check # Define the subnet you want to check
desired_subnet=$FRAMEWORK_NETWORK_SUBNET desired_subnet=$FRAMEWORK_NETWORK_SUBNET
@@ -124,13 +108,7 @@ check_framework_network_availabity() {
echo "Subnet $desired_subnet is not available for creation. Need to find another network" echo "Subnet $desired_subnet is not available for creation. Need to find another network"
else else
echo "Subnet $desired_subnet is available for creation." echo "Subnet $desired_subnet is available for creation."
fi fi
echo "Creating network $FRAMEWORK_SCHEDULER_NETWORK"
docker network create $FRAMEWORK_SCHEDULER_NETWORK --subnet $FRAMEWORK_NETWORK_SUBNET
else
echo "Network $DOCKER_NETWORK_NAME already exists, need to define another name"
fi
} }
check_redis_availability() { check_redis_availability() {
@@ -249,4 +227,4 @@ while true; do
fi fi
sleep 1 sleep 1
done done