From cc6fb239caf1f86cb3931f23292d6865c3ba7f22 Mon Sep 17 00:00:00 2001 From: David Mays Date: Fri, 3 May 2024 16:58:06 +0100 Subject: [PATCH] Enable ARM builds for link-checker-api --- .github/workflows/deploy.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8322900f..5712d966 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,7 +25,7 @@ jobs: build-and-publish-image: if: github.event_name == 'workflow_dispatch' || startsWith(github.event.release.tag_name, 'v') name: Build and publish 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.event.release.tag_name }} permissions: diff --git a/Dockerfile b/Dockerfile index 5675cfa1..1f33f3fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version -FROM $builder_image AS builder +FROM --platform=$TARGETPLATFORM $builder_image AS builder WORKDIR $APP_HOME COPY Gemfile* .ruby-version ./ @@ -12,7 +12,7 @@ COPY . . RUN bootsnap precompile --gemfile . -FROM $base_image +FROM --platform=$TARGETPLATFORM $base_image ENV GOVUK_APP_NAME=link-checker-api