Merge pull request #362 from alphagov/ENG-487

Eng-487-update dependencies and base images for raat

.github/workflows/run-tests-on-pr.yml

@@ -5,4 +5,4 @@ on:
 
 jobs:
   run-tests: 
-    uses: alphagov/re-request-an-aws-account/.github/workflows/run-tests.yaml@main
+    uses: ./.github/workflows/run-tests.yaml

.github/workflows/run-tests.yaml

@@ -10,9 +10,9 @@ jobs:
     - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
 
     - name: Set up Ruby
-      uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7
+      uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442
       with:
-        ruby-version: '3.2'
+        ruby-version: '3.3.5'
 
     - name: Set up Node
       uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c

.ruby-version

@@ -1 +1 @@
-3.2.3
+3.3.5

Dockerfile

@@ -1,12 +1,12 @@
 # get official nodejs/npm binaries
-FROM node:20.11-slim as nodebuilder
+FROM node:22.9-slim as nodebuilder
 WORKDIR /opt/app
 COPY package-lock.json ./
 COPY package.json ./
 RUN npm i
 
 # bundle install the gems for production
-FROM ruby:3.2.3 as rubybuilder
+FROM ruby:3.3.5 as rubybuilder
 RUN apt update -y \
     && apt -y install nano \
     && cp /usr/bin/nano /usr/local/bin/
@@ -16,7 +16,7 @@ RUN bundle config set --local without 'development test' \
     && bundle install
 
 # copy required files from base images, precompile assets & cleanup
-FROM ruby:3.2.3-slim
+FROM ruby:3.3.5-slim
 WORKDIR /opt/app
 COPY --from=rubybuilder /usr/local/bundle /usr/local/bundle
 COPY --from=nodebuilder /usr/local/bin /usr/local/nodebin

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '~> 3.2.3'
+ruby '~> 3.3.5'
 
 gem 'dotenv-rails', groups: [:development]
 
@@ -16,6 +16,7 @@ gem 'sassc-rails'
 gem 'webmock', '~> 3.23.0'
 gem 'webrick', '~> 1.8.1'
 gem 'aws-sdk', '~> 3'
+gem 'rexml', '~> 3.3.7'
 
 group :test do
   gem 'rack_session_access', '~> 0.2.0'