Merge pull request #79 from alphagov/dj-maisy/test_app_arm

Get ARM Builds, Update Ruby to 3.3.1

.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:

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.1

Dockerfile

@@ -2,13 +2,13 @@ ARG ruby_version=3.3
 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 . .
 
-FROM $base_image
+FROM --platform=$TARGETPLATFORM $base_image
 WORKDIR $APP_HOME
 COPY --from=builder $BUNDLE_PATH $BUNDLE_PATH
 COPY --from=builder $APP_HOME .

Gemfile.lock

@@ -3,9 +3,9 @@ GEM
   specs:
     daemons (1.4.1)
     eventmachine (1.2.7)
-    prometheus_exporter (2.0.8)
+    prometheus_exporter (2.1.0)
       webrick
-    rack (2.2.8.1)
+    rack (2.2.9)
     thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -15,6 +15,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-22
+  arm64-darwin-23
   arm64-linux
   x86_64-darwin-20
   x86_64-darwin-22
@@ -26,4 +27,4 @@ DEPENDENCIES
   thin
 
 BUNDLED WITH
-   2.4.19
+   2.5.9