From d8d040c1189ac33ec74fedc0174581075a263fdb Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:21:03 +0000 Subject: [PATCH] exp: set arch tag in e2e docker compose --- .../end-to-end/scripts/docker-compose-no-sandbox.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose-p2p.yml | 2 +- .../end-to-end/scripts/docker-compose-wallet.yml | 2 +- yarn-project/end-to-end/scripts/docker-compose.yml | 2 +- yarn-project/end-to-end/scripts/e2e_compose_test.sh | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml index 9070e754e8a..c11eca2414c 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-amd64 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always entrypoint: > sh -c ' diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml index 084bd0523cb..57f3b51c8fb 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-amd64 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337' expose: diff --git a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml index b78db12fb97..f896569f7ca 100644 --- a/yarn-project/end-to-end/scripts/docker-compose-wallet.yml +++ b/yarn-project/end-to-end/scripts/docker-compose-wallet.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-amd64 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always entrypoint: > sh -c ' diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index a1c041d21c8..cebb63ff048 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: fork: - image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-amd64 + image: aztecprotocol/foundry:25f24e677a6a32a62512ad4f561995589ac2c7dc-${ARCH_TAG:-amd64} pull_policy: always entrypoint: > sh -c ' diff --git a/yarn-project/end-to-end/scripts/e2e_compose_test.sh b/yarn-project/end-to-end/scripts/e2e_compose_test.sh index c82338c9b8b..eb3e419f614 100755 --- a/yarn-project/end-to-end/scripts/e2e_compose_test.sh +++ b/yarn-project/end-to-end/scripts/e2e_compose_test.sh @@ -19,6 +19,15 @@ COMPOSE_FILE="${COMPOSE_FILE:-./scripts/docker-compose.yml}" export DEBUG="${DEBUG:-aztec:*}" export HARDWARE_CONCURRENCY="${HARDWARE_CONCURRENCY:-}" export AZTEC_DOCKER_TAG="${AZTEC_DOCKER_TAG:-$(git rev-parse HEAD)}" + +# Set the ARCH_TAG variable for docker compose +ARCH=$(uname -m) +if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then + export ARCH_TAG="arm64" +else + export ARCH_TAG="amd64" +fi + FORCE_BUILD="${FORCE_BUILD:-true}" # Compute project_name