From ab5ff80b2848f9e07c1ce76c5684a33d0e10bde8 Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Wed, 27 Dec 2023 10:07:30 +0000 Subject: [PATCH 1/3] Remove .ruby-version We don't need this file as it contains the same information as in the .tool-versions file. --- .prettierignore | 1 - .ruby-version | 1 - Dockerfile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .ruby-version diff --git a/.prettierignore b/.prettierignore index 171c38c038..c8bd1e3912 100644 --- a/.prettierignore +++ b/.prettierignore @@ -16,7 +16,6 @@ .prettierignore .rladr .rspec -.ruby-version .tool-versions Dockerfile LICENCE diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index be94e6f53d..0000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.2.2 diff --git a/Dockerfile b/Dockerfile index 04b7d3e63a..7081942731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN apk upgrade --no-cache openssl libssl3 libcrypto3 curl RUN apk add --update --no-cache build-base yarn postgresql14-dev git vips-dev # Install gems defined in Gemfile -COPY .ruby-version Gemfile Gemfile.lock ./ +COPY Gemfile Gemfile.lock ./ # Install gems and remove gem cache RUN bundler -v && \ From 927513546ba1e968aa575c10adeb0a6d33f69c3d Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Wed, 27 Dec 2023 09:47:06 +0000 Subject: [PATCH 2/3] Upgrade to Ruby 3.3.0 This version was released a couple of days ago and doesn't have any breaking changes with our service, so we should upgrade as soon as possible to avoid ending up out of date. --- .tool-versions | 2 +- Dockerfile | 4 ++-- Gemfile | 2 +- Gemfile.lock | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.tool-versions b/.tool-versions index 9d159e28ae..c2e3e4032a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,6 +2,6 @@ azure-cli 2.51.0 kubectl 1.27.3 nodejs 18.1.0 postgres 14.9 -ruby 3.2.2 +ruby 3.3.0 terraform 1.5.0 yarn 1.22.19 diff --git a/Dockerfile b/Dockerfile index 7081942731..c2abc4f241 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # production: runs the actual app # Build builder image -FROM ruby:3.2.2-alpine as builder +FROM ruby:3.3.0-alpine as builder WORKDIR /app @@ -60,7 +60,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \ find /usr/local/bundle/gems -name "*.html" -delete # Build runtime image -FROM ruby:3.2.2-alpine as production +FROM ruby:3.3.0-alpine as production # The application runs from /app WORKDIR /app diff --git a/Gemfile b/Gemfile index 4c095beb1d..06d66accb5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.2.2" +ruby "3.3.0" gem "rails", "7.1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 494252e8b4..111b551880 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -306,6 +306,7 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.5) + mini_portile2 (2.8.5) minitest (5.20.0) msgpack (1.7.2) multi_json (1.15.0) @@ -587,6 +588,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-21 x86_64-darwin-22 x86_64-linux @@ -652,7 +654,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.0p0 BUNDLED WITH 2.4.10 From 7f334d7b8921da072672dfe94e757bc041ecb2d8 Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Wed, 27 Dec 2023 09:48:58 +0000 Subject: [PATCH 3/3] Bundle update This updates a number of Gems which are out of date. --- Gemfile.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 111b551880..bfda413cfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,7 @@ GIT GEM remote: https://rubygems.org/ specs: + abbrev (0.1.2) actioncable (7.1.2) actionpack (= 7.1.2) activesupport (= 7.1.2) @@ -139,7 +140,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - cgi (0.3.6) + cgi (0.4.1) climate_control (1.2.0) concurrent-ruby (1.2.2) connection_pool (2.4.1) @@ -265,11 +266,11 @@ GEM govuk_markdown (2.0.1) activesupport redcarpet - haml (6.2.3) + haml (6.3.0) temple (>= 0.8.2) thor tilt - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) html-attributes-utils (1.0.2) activesupport (>= 6.1.4.4) @@ -341,7 +342,7 @@ GEM snaky_hash (~> 2.0) version_gem (~> 1.1) okcomputer (1.18.5) - omniauth (2.1.1) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -423,7 +424,8 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.1.0) - rbs (3.2.2) + rbs (3.4.1) + abbrev rdoc (6.6.2) psych (>= 4.0.0) redcarpet (3.6.0) @@ -509,7 +511,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) shoulda-matchers (6.0.0) activesupport (>= 5.2.0) - sidekiq (6.5.11) + sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) @@ -556,7 +558,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unicode-display_width (2.5.0) validate_url (1.0.15) activemodel (>= 3.0.0)