Skip to content

Commit

Permalink
Merge pull request #1367 from alphagov/dj-maisy/enable_arm
Browse files Browse the repository at this point in the history
Start building asset-manager for ARM.
  • Loading branch information
dj-maisy authored May 2, 2024
2 parents 1db6b8f + e836edd commit 30426c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
ARG clam_engine=clamav-1.2.1.linux.x86_64.deb

FROM $builder_image AS builder
FROM --platform=$TARGETPLATFORM $builder_image AS builder

WORKDIR $APP_HOME
COPY Gemfile Gemfile.lock .ruby-version ./
Expand All @@ -12,7 +12,7 @@ COPY . .
RUN bootsnap precompile --gemfile .


FROM $base_image
FROM --platform=$TARGETPLATFORM $base_image

ARG clam_engine
ENV GOVUK_APP_NAME=asset-manager
Expand Down

0 comments on commit 30426c0

Please sign in to comment.