From 242f7806a21a8706779545df15b40f33a7745695 Mon Sep 17 00:00:00 2001 From: Charlie Lye Date: Fri, 27 Oct 2023 13:17:16 +0100 Subject: [PATCH] fix: docker-compose up, rather than run. (#3081) `docker run` seems to be exposing race conditions in how certain tests start. e.g. guides/* Reverting to `docker up`, although worried it's masking issues. --- build-system/scripts/cond_run_compose | 2 +- yarn-project/end-to-end/scripts/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-system/scripts/cond_run_compose b/build-system/scripts/cond_run_compose index 58eef99c71a..025b66f7abc 100755 --- a/build-system/scripts/cond_run_compose +++ b/build-system/scripts/cond_run_compose @@ -27,7 +27,7 @@ if ! check_rebuild $SUCCESS_TAG $REPOSITORY; then cd $(query_manifest projectDir $REPOSITORY) export $@ - docker-compose -f $COMPOSE_FILE run $REPOSITORY + docker-compose -f $COMPOSE_FILE up --exit-code-from $REPOSITORY --force-recreate upload_logs_to_s3 log diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 85c90b07cd6..81b15fcbd52 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -32,7 +32,7 @@ services: environment: BENCHMARK: 'true' LOG_LEVL: 'debug' - DEBUG: ${DEBUG:-'aztec:*'} + DEBUG: ${DEBUG:-aztec:*} ETHEREUM_HOST: http://fork:8545 CHAIN_ID: 31337 PXE_URL: http://sandbox:8080