Browse Source

edit swarnlab-sec from docker-compose 2 docker compose

master
zeus 6 months ago
parent
commit
f0d069bad3
  1. 42
      install/usr/share/swarmlab.io/sec/swarmlab-sec

42
install/usr/share/swarmlab.io/sec/swarmlab-sec

@ -444,10 +444,10 @@ down_all ()
printf "\\n\\n===> CLEAN UP SWARMLAB" printf "\\n\\n===> CLEAN UP SWARMLAB"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose down" echo "$ docker compose down"
printf "\\n" printf "\\n"
docker-compose down docker compose down
} }
up_registry () up_registry ()
@ -455,12 +455,12 @@ up_registry ()
printf "\\n\\n===> SPIN UP REGISTRY" printf "\\n\\n===> SPIN UP REGISTRY"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose up -d registry" echo "$ docker compose up -d registry"
printf "\\n" printf "\\n"
#docker stop swarmlab-registry || true && docker rm swarmlab-registry || true # remove for microservices #docker stop swarmlab-registry || true && docker rm swarmlab-registry || true # remove for microservices
docker container prune --force docker container prune --force
docker-compose up --no-recreate -d registry docker compose up --no-recreate -d registry
} }
generate_ssh_keys () generate_ssh_keys ()
@ -495,18 +495,18 @@ up_master ()
{ {
printf "\\n\\n===> SPIN UP MASTER NODE" printf "\\n\\n===> SPIN UP MASTER NODE"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose up -d masterservice" echo "$ docker compose up -d masterservice"
printf "\\n" printf "\\n"
echo "$ $IMAGE_local -d $IMAGE_origin" echo "$ $IMAGE_local -d $IMAGE_origin"
printf "\\n" printf "\\n"
docker-compose rm -f -s -v docker compose rm -f -s -v
docker-compose up --build --remove-orphans --force-recreate -d masterservice << ANSWERS docker compose up --build --remove-orphans --force-recreate -d masterservice << ANSWERS
yes yes
yes yes
yes yes
ANSWERS ANSWERS
#docker-compose up --force-recreate -d masterservice #docker compose up --force-recreate -d masterservice
} }
@ -514,19 +514,19 @@ up_workers ()
{ {
printf "\\n\\n===> SPIN UP WORKER NODES" printf "\\n\\n===> SPIN UP WORKER NODES"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose up -d worker" echo "$ docker compose up -d worker"
printf "\\n" printf "\\n"
docker-compose rm -f -s -v docker compose rm -f -s -v
docker-compose up --build --force-recreate --renew-anon-volumes --remove-orphans -d workerservice docker compose up --build --force-recreate --renew-anon-volumes --remove-orphans -d workerservice
#docker-compose up --force-recreate -d workerservice #docker compose up --force-recreate -d workerservice
printf "\\n" printf "\\n"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
NUM_WORKER=$((SIZE - 1)) NUM_WORKER=$((SIZE - 1))
echo "$ docker-compose scale workerservice=$NUM_WORKER" echo "$ docker compose scale workerservice=$NUM_WORKER"
printf "\\n" printf "\\n"
docker-compose scale workerservice=${NUM_WORKER} docker compose scale workerservice=${NUM_WORKER}
} }
down_master () down_master ()
@ -534,34 +534,34 @@ down_master ()
printf "\\n\\n===> TORN DOWN MASTER NODE" printf "\\n\\n===> TORN DOWN MASTER NODE"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose stop masterservice && docker-compose rm -f masterservice" echo "$ docker compose stop masterservice && docker compose rm -f masterservice"
printf "\\n" printf "\\n"
docker-compose stop masterservice && docker-compose rm -f masterservice docker compose stop masterservice && docker compose rm -f masterservice
} }
down_workers () down_workers ()
{ {
printf "\\n\\n===> TORN DOWN WORKER NODES" printf "\\n\\n===> TORN DOWN WORKER NODES"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose stop worker && docker-compose rm -f worker" echo "$ docker compose stop worker && docker compose rm -f worker"
printf "\\n" printf "\\n"
docker-compose stop workerservice && docker-compose rm -f workerservice docker compose stop workerservice && docker compose rm -f workerservice
} }
list () list ()
{ {
printf "\\n\\n===> LIST CONTAINERS" printf "\\n\\n===> LIST CONTAINERS"
printf "\\n%s\\n" "$HEADER" printf "\\n%s\\n" "$HEADER"
echo "$ docker-compose ps" echo "$ docker compose ps"
printf "\\n" printf "\\n"
docker-compose ps docker compose ps
} }
exec_on_mpi_master_container () exec_on_mpi_master_container ()
{ {
# shellcheck disable=SC2046 # shellcheck disable=SC2046
docker exec -it -u $DOCKERuser $(docker-compose ps | grep 'masterservice'| awk 'NR==1{print $1}') "$@" docker exec -it -u $DOCKERuser $(docker compose ps | grep 'masterservice'| awk 'NR==1{print $1}') "$@"
} }
prompt_ready () prompt_ready ()

Loading…
Cancel
Save