Skip to content

Commit

Permalink
Merge pull request #96 from alphagov/dj-maisy/search_v2_eval_arm
Browse files Browse the repository at this point in the history
Enable ARM builds for Search V2 Evaluator
  • Loading branch information
dj-maisy authored May 20, 2024
2 parents db2b7bc + c88de1f commit 7f04cbd
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 @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ 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 ./
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

Expand Down

0 comments on commit 7f04cbd

Please sign in to comment.