diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2bcd9de..c3ba87b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,7 +26,7 @@ jobs: build-and-publish-image: if: github.event_name == 'workflow_dispatch' || startsWith(github.ref_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.ref_name }} permissions: diff --git a/Dockerfile b/Dockerfile index dbb4eeb..cc09f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG ruby_version=3.3.1 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 ./ @@ -10,7 +10,7 @@ RUN bundle install COPY . . RUN rails assets:precompile && rm -fr log -FROM $base_image +FROM --platform=$TARGETPLATFORM $base_image ENV GOVUK_APP_NAME=search-v2-evaluator