Merge pull request #1290 from alphagov/dj-maisy/arm_sidecar_images

Enable ARM builds for "sidecar" images.
alphagov · May 8, 2024 · b96c2a3 · b96c2a3
2 parents d3a0166 + 1dac586
commit b96c2a3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-clamav-image.yml b/.github/workflows/build-clamav-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: clamav

diff --git a/.github/workflows/build-mongodb-image.yml b/.github/workflows/build-mongodb-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: mongodb

diff --git a/.github/workflows/build-toolbox-image.yml b/.github/workflows/build-toolbox-image.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   build-and-push-image:
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-multiarch-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
       ecrRepositoryName: toolbox

diff --git a/images/clamav/Dockerfile b/images/clamav/Dockerfile
@@ -1,4 +1,4 @@
-FROM clamav/clamav-debian:1.2
+FROM --platform=$TARGETPLATFORM clamav/clamav-debian:1.2
 
 COPY "./images/clamav/scripts/unprivileged-entrypoint.sh" "/unpriv-init"
 

diff --git a/images/mongodb/Dockerfile b/images/mongodb/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lts/ubuntu:22.04
+FROM --platform=$TARGETPLATFORM public.ecr.aws/lts/ubuntu:22.04
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
 ENV MONGO_VERSION 2.6.12

diff --git a/images/toolbox/Dockerfile b/images/toolbox/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lts/ubuntu:22.04
+FROM --platform=$TARGETPLATFORM public.ecr.aws/lts/ubuntu:22.04
 ARG TARGETARCH
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]