Add ARM Support, Bump Ruby to 3.3.3

alphagov · Jul 15, 2024 · 44d3184 · 44d3184
1 parent 1581902
commit 44d3184
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   build-and-publish-image:
     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/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.1
+3.3.3
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2-alpine
+FROM --platform=$TARGETPLATFORM ruby:3.3-alpine
 
 COPY Gemfile* ./
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
     diff-lcs (1.5.1)
-    faraday (2.9.1)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-net_http (3.1.0)
       net-http
+    logger (1.6.0)
     net-http (0.4.1)
       uri
     octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     prometheus-client (4.2.3)
       base64
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
@@ -46,4 +48,4 @@ DEPENDENCIES
   slop
 
 BUNDLED WITH
-   2.5.9
+   2.5.11