From 1c115ba1545b765ebe4dc0972017612f01d8c23b Mon Sep 17 00:00:00 2001 From: Lars Ludvigsen Date: Sun, 24 Mar 2024 13:58:12 +0100 Subject: [PATCH] Revert "New syntax for swarm" This reverts commit fa942ce4347c391f6b24ef891162c940e2d025d3. --- scripts/evaluation/start.sh | 2 +- scripts/training/start.sh | 2 +- scripts/viewer/start.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/evaluation/start.sh b/scripts/evaluation/start.sh index fc0d2175..8f1dc12d 100755 --- a/scripts/evaluation/start.sh +++ b/scripts/evaluation/start.sh @@ -93,7 +93,7 @@ fi # Check if we will use Docker Swarm or Docker Compose if [[ "${DR_DOCKER_STYLE,,}" == "swarm" ]]; then - DISPLAY=$ROBO_DISPLAY docker stack deploy -d $COMPOSE_FILES $STACK_NAME + DISPLAY=$ROBO_DISPLAY docker stack deploy $COMPOSE_FILES $STACK_NAME else DISPLAY=$ROBO_DISPLAY docker compose $COMPOSE_FILES -p $STACK_NAME up -d fi diff --git a/scripts/training/start.sh b/scripts/training/start.sh index 968dd23d..16984e6b 100755 --- a/scripts/training/start.sh +++ b/scripts/training/start.sh @@ -187,7 +187,7 @@ if [[ "${DR_DOCKER_STYLE,,}" == "swarm" ]]; then exit 1 fi - DISPLAY=$ROBO_DISPLAY docker stack deploy -d $COMPOSE_FILES $STACK_NAME + DISPLAY=$ROBO_DISPLAY docker stack deploy $COMPOSE_FILES $STACK_NAME else DISPLAY=$ROBO_DISPLAY docker compose $COMPOSE_FILES -p $STACK_NAME up -d --scale robomaker=$DR_WORKERS diff --git a/scripts/viewer/start.sh b/scripts/viewer/start.sh index 2ebde2a1..1f743171 100755 --- a/scripts/viewer/start.sh +++ b/scripts/viewer/start.sh @@ -110,7 +110,7 @@ COMPOSE_FILES=$DR_DIR/docker/docker-compose-webviewer.yml if [[ "${DR_DOCKER_STYLE,,}" == "swarm" ]]; then COMPOSE_FILES="$COMPOSE_FILES -c $DR_DIR/docker/docker-compose-webviewer-swarm.yml" - docker stack deploy -d -c $COMPOSE_FILES $STACK_NAME + docker stack deploy -c $COMPOSE_FILES $STACK_NAME else docker compose -f $COMPOSE_FILES -p $STACK_NAME up -d fi