From c6e21711e51d17b384cc45a7b41b241c96b898f2 Mon Sep 17 00:00:00 2001 From: Jay Kickliter Date: Thu, 6 Apr 2023 11:53:11 -0600 Subject: [PATCH 1/2] Remove outdated comment --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff4930d1..639548f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,6 @@ # # docker buildx build --platform linux/arm64,linux/amd64 . # -# Adding support for additional architectures requires editing the -# `case "$TARGETPLATFORM" in` in the build stage (and likely quite a -# bit of googling). -# # 1: https://www.docker.com/blog/how-to-rapidly-build-multi-architecture-images-with-buildx # 2: https://docs.docker.com/build/install-buildx # ============================================================================== From 14f635a1783df181cbd07f28fa052ee3f11ff07f Mon Sep 17 00:00:00 2001 From: Jay Kickliter Date: Thu, 6 Apr 2023 11:53:44 -0600 Subject: [PATCH 2/2] Do not generate attestation manifests in docker images --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 180e5ffb..d7355cd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,6 +164,10 @@ jobs: # We publish all builds to the test-images repo. - name: Build | Test Image + env: + # The attestation manifests cause build errors for some makers. + # See https://github.com/helium/gateway-rs/issues/409 + BUILDX_NO_DEFAULT_ATTESTATIONS: 1 run: | docker buildx build \ --platform linux/arm64,linux/amd64 \ @@ -174,6 +178,10 @@ jobs: # Publish to miner quay-repo on release only. - name: Build | Release Image + env: + # The attestation manifests cause build errors for some makers. + # See https://github.com/helium/gateway-rs/issues/409 + BUILDX_NO_DEFAULT_ATTESTATIONS: 1 if: startsWith(github.ref, 'refs/tags') run: | docker buildx build \