Merge pull request #142 from ava-labs/gstuart/docker-compose-abort-on…

…-container-exit Set all containers to exit if one exits early
ava-labs · Nov 20, 2023 · e035112 · e035112
2 parents 8c08753 + 5c37598
commit e035112
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/local/run.sh b/scripts/local/run.sh
@@ -48,7 +48,7 @@ setARCH
 
 if [ -z "$LOCAL_RELAYER_IMAGE" ]; then
     echo "Using published awm-relayer image"
-    docker compose -f docker/docker-compose-run.yml --project-directory ./ up --build &
+    docker compose -f docker/docker-compose-run.yml --project-directory ./ up --abort-on-container-exit --build &
 else
     echo "Using local awm-relayer image: $LOCAL_RELAYER_IMAGE"
     if [[ "$(docker images -q awm-relayer:$LOCAL_RELAYER_IMAGE 2> /dev/null)" == "" ]]; then
@@ -57,7 +57,7 @@ else
     fi
     rm -f docker/docker-compose-run-local.yml
     sed "s/<TAG>/$LOCAL_RELAYER_IMAGE/g" docker/docker-compose-run-local-template.yml > docker/docker-compose-run-local.yml
-    docker compose -f docker/docker-compose-run-local.yml --project-directory ./ up --build &
+    docker compose -f docker/docker-compose-run-local.yml --project-directory ./ up --abort-on-container-exit --build &
 fi
 
 tail -f /dev/null
diff --git a/scripts/local/test.sh b/scripts/local/test.sh
@@ -52,7 +52,7 @@ setARCH
 
 if [ -z "$LOCAL_RELAYER_IMAGE" ]; then
     echo "Using published awm-relayer image"
-    docker compose -f docker/docker-compose-test.yml --project-directory ./ up --build &
+    docker compose -f docker/docker-compose-test.yml --project-directory ./ up --abort-on-container-exit --build &
     dockerPid=$!
 else
     echo "Using local awm-relayer image: $LOCAL_RELAYER_IMAGE"
@@ -62,7 +62,7 @@ else
     fi
     rm -f docker/docker-compose-test-local.yml
     sed "s/<TAG>/$LOCAL_RELAYER_IMAGE/g" docker/docker-compose-test-local-template.yml > docker/docker-compose-test-local.yml
-    docker compose -f docker/docker-compose-test-local.yml --project-directory ./ up --build &
+    docker compose -f docker/docker-compose-test-local.yml --project-directory ./ up --abort-on-container-exit --build &
     dockerPid=$!
 fi