From 0989b5896ede0da67a9b736191aa59659968ef4c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 Nov 2023 13:06:06 +0000
Subject: [PATCH 1/3] Update dependency ruby to v3.2.2

---
 .ruby-version | 2 +-
 Dockerfile    | 2 +-
 Gemfile       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index e4604e3a..be94e6f5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/Dockerfile b/Dockerfile
index 7529f020..5d7e6d38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------------------
 # Base
 # ------------------------------------------------------------------------------
-FROM ruby:3.2.1 as base
+FROM ruby:3.2.2 as base
 LABEL org.opencontainers.image.authors="contact@dxw.com"
 
 RUN curl -L https://deb.nodesource.com/setup_16.x | bash -
diff --git a/Gemfile b/Gemfile
index afa20541..906aa485 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby "3.2.1"
+ruby "3.2.2"
 
 gem "bootsnap", ">= 1.1.0", require: false
 gem "bootstrap", ">= 4.3.1"

From 5a948e60248a98f4f43d7bbaad3ef3532bde35ed Mon Sep 17 00:00:00 2001
From: Laura Porter <laura@dxw.com>
Date: Thu, 21 Dec 2023 10:31:47 +0000
Subject: [PATCH 2/3] (Fix) Commit bundler ruby version update automatically
 generated by bundler

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9028e23b..7b3a887d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -409,7 +409,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.7

From b1167aed73880b8171fe0076e351b417cca7264c Mon Sep 17 00:00:00 2001
From: Laura Porter <laura@dxw.com>
Date: Thu, 21 Dec 2023 11:49:57 +0000
Subject: [PATCH 3/3] (Fix) Update Dockerfile for Ruby 3.2.2 upgrade

We had some CI failures on the Ruby 3.2.2 Renovate PR. The CI failed like so:

```
==> Linting CSS...
yarn run v1.22.19
$ npx stylelint "app/**/*css"
/bin/sh: 1: npx: not found
error Command failed with exit code 127.
```

After a bit of Googling the problem seemed to be a node version which did not
support the npx command (a bug). Updating the node version in the Dockerfile
seems to fix this.

At the same time, update the Rubygems version and Bundler versions, as
maintenance.
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d7e6d38..382c7de2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 FROM ruby:3.2.2 as base
 LABEL org.opencontainers.image.authors="contact@dxw.com"
 
-RUN curl -L https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -L https://deb.nodesource.com/setup_20.x | bash -
 RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN \
   echo "deb https://dl.yarnpkg.com/debian/ stable main" | \
@@ -38,8 +38,8 @@ ENV BUNDLE_GEM_GROUPS ${RAILS_ENV}
 COPY Gemfile ${DEPS_HOME}/Gemfile
 COPY Gemfile.lock ${DEPS_HOME}/Gemfile.lock
 
-RUN gem update --system 3.3.5
-RUN gem install bundler -v 2.3.5
+RUN gem update --system 3.5.1
+RUN gem install bundler -v 2.4.7
 RUN bundle config set frozen "true"
 RUN bundle config set no-cache "true"
 RUN bundle config set with "${BUNDLE_GEM_GROUPS}"