From 91b652e370c147461c7082db65ec2d77acbd9847 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Thu, 30 Nov 2023 13:36:56 -0600 Subject: [PATCH 1/3] Add platforms field to image builds --- .github/workflows/integration-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9af240532..1e65b011b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -50,6 +50,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} file: orchestrator/Dockerfile push: true + platforms: linux/amd64, linux/arm64/v8 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=local,src=/tmp/.buildx-cache @@ -103,6 +104,7 @@ jobs: context: ./module file: module/Dockerfile push: true + platforms: linux/amd64, linux/arm64/v8 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} builder: ${{ steps.buildx.outputs.name }} @@ -203,6 +205,7 @@ jobs: context: integration_tests/ethereum file: integration_tests/ethereum/Dockerfile push: true + platforms: linux/amd64, linux/arm64/v8 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} builder: ${{ steps.buildx.outputs.name }} From 17dddffbaca82565f1bd5ae3fd54e17cd1d37b93 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Thu, 30 Nov 2023 13:48:01 -0600 Subject: [PATCH 2/3] Fix cargo-chef build error --- orchestrator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orchestrator/Dockerfile b/orchestrator/Dockerfile index 6296203e9..8e2643d3e 100644 --- a/orchestrator/Dockerfile +++ b/orchestrator/Dockerfile @@ -1,7 +1,7 @@ # Reference: https://www.lpalmieri.com/posts/fast-rust-docker-builds/ -FROM rust:1.68 as cargo-chef-rust -RUN cargo install cargo-chef --version 0.1.51 +FROM rust:1.70 as cargo-chef-rust +RUN cargo install cargo-chef --version 0.1.63 FROM cargo-chef-rust as planner WORKDIR app From 324b415f75970d3612c65807e1c8edc6c06b037e Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Thu, 30 Nov 2023 13:53:05 -0600 Subject: [PATCH 3/3] Oops --- orchestrator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orchestrator/Dockerfile b/orchestrator/Dockerfile index 8e2643d3e..523646bd3 100644 --- a/orchestrator/Dockerfile +++ b/orchestrator/Dockerfile @@ -1,7 +1,7 @@ # Reference: https://www.lpalmieri.com/posts/fast-rust-docker-builds/ FROM rust:1.70 as cargo-chef-rust -RUN cargo install cargo-chef --version 0.1.63 +RUN cargo install cargo-chef --version 0.1.62 FROM cargo-chef-rust as planner WORKDIR app