Update Ruby version to v3.4.1

.rubocop.yml

@@ -6,7 +6,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.3
+  TargetRubyVersion: 3.4
   Exclude:
     - 'db/**/*'
     - 'script/**/*'

.ruby-version

@@ -1 +1 @@
-3.3.6
+3.4.1

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Upgrade ruby version to v3.4.1 ([PR 982](https://github.com/Crown-Commercial-Service/pmp-idam/pull/982))
+- Upgrade alpine version to v3.21 ([PR 982](https://github.com/Crown-Commercial-Service/pmp-idam/pull/982))
 - Update ruby to v3.3.6 ([PR 932](https://github.com/Crown-Commercial-Service/pmp-idam/pull/932))
 - Update Node to LTS Jod (v22.11.0) ([PR 931](https://github.com/Crown-Commercial-Service/pmp-idam/pull/931))
 - Update alpine to v3.20 ([PR 841](https://github.com/Crown-Commercial-Service/pmp-idam/pull/841))

Dockerfile

@@ -1,15 +1,19 @@
 # Set the alpine version so they match for both images
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 # Set the NodeJS version
 ARG NODE_VERSION=jod
 
 # Set the Ruby version
-ARG RUBY_VERSION=3.3.6
+ARG RUBY_VERSION=3.4.1
 
 # Pull in the NodeJS image
 FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS node
 
+# Remove yarn as we already have it downloaded in the app
+RUN rm /usr/local/bin/yarn && \
+    rm /usr/local/bin/yarnpkg
+
 # Pull in the Ruby image
 FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} AS base
 
@@ -32,14 +36,14 @@ FROM base AS build
 # to our current ruby build image stage
 # so that the ruby image build stage has the correct nodejs version
 COPY --from=node /usr/local/bin /usr/local/bin
+COPY --from=node /usr/local/lib /usr/local/lib
 
 # Install application dependencies
 RUN apk add --update --no-cache \
     build-base \
     curl \
     git \
     libpq-dev \
-    npm \
     tzdata
 
 # Enable corepack for yarn

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.3.6'
+ruby '3.4.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.1.5'

Gemfile.lock

@@ -417,7 +417,7 @@ DEPENDENCIES
   web-console (~> 4.2.1)
 
 RUBY VERSION
-   ruby 3.3.6p108
+   ruby 3.4.1p0
 
 BUNDLED WITH
    2.4.6

README.md

@@ -10,7 +10,7 @@ This README assumes you are using a MacBook. If you are using a different operat
 
 
 ### Ruby
-This is a Ruby on Rails application using ruby version `3.3.6`.
+This is a Ruby on Rails application using ruby version `3.4.1`.
 Ensure that, if you are using a ruby environment manager, the correct ruby version is being run in your development environment.
 
 This project uses Ruby Gems so you will need to install bundler which can be done with: