From 91e0ec9f598eeb8e0a68dbe7f939f79e30dceb1e Mon Sep 17 00:00:00 2001
From: Eric Boehs <eric@boehs.com>
Date: Fri, 31 Mar 2023 09:58:54 -0500
Subject: [PATCH] Update Ruby to 3.1.4 (CVE) (#12305)

* Upgrade to Ruby 3.1.4

* Use PR for ruby/setup-ruby GHA
---
 .github/workflows/code_checks.yml | 3 ++-
 .ruby-version                     | 2 +-
 Dockerfile                        | 4 ++--
 Gemfile                           | 2 +-
 Gemfile.lock                      | 2 +-
 docs/setup/native.md              | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
index c11b87c3fec..dd5f678d477 100644
--- a/.github/workflows/code_checks.yml
+++ b/.github/workflows/code_checks.yml
@@ -12,7 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: ruby/setup-ruby@v1
+      # Lock back to an @v1-version once https://github.com/ruby/setup-ruby/pull/491 is merged
+      - uses: ruby/setup-ruby@5dd9cb06655f300c93ea885847ed649645656ba0
         with:
           bundler-cache: true
 
diff --git a/.ruby-version b/.ruby-version
index ff365e06b95..0aec50e6ede 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.3
+3.1.4
diff --git a/Dockerfile b/Dockerfile
index 5d4861bac67..d6950fb1683 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 #      stretch (or in alpine) and is switched automatically to pdftk-java in buster
 #      https://github.com/department-of-veterans-affairs/va.gov-team/issues/3032
 
-FROM ruby:3.1.3-slim-bullseye AS modules
+FROM ruby:3.1.4-slim-bullseye AS modules
 
 WORKDIR /tmp
 
@@ -14,7 +14,7 @@ RUN find modules -type f ! \( -name Gemfile -o -name "*.gemspec" -o -path "*/lib
 ###
 # shared build/settings for all child images, reuse these layers yo
 ###
-FROM ruby:3.1.3-slim-bullseye AS base
+FROM ruby:3.1.4-slim-bullseye AS base
 
 ARG userid=993
 SHELL ["/bin/bash", "-c"]
diff --git a/Gemfile b/Gemfile
index ed8e999248e..3a15e972953 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '~> 3.1.3'
+ruby '~> 3.1.4'
 
 # Modules
 path 'modules' do
diff --git a/Gemfile.lock b/Gemfile.lock
index 07141aa8042..4ba9455e793 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1216,7 +1216,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.1.3p185
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.4.10
diff --git a/docs/setup/native.md b/docs/setup/native.md
index 8b270f210f9..daec8aed117 100644
--- a/docs/setup/native.md
+++ b/docs/setup/native.md
@@ -2,7 +2,7 @@
 
 Vets API requires:
 
-- Ruby 3.1.3
+- Ruby 3.1.4
 - PostgreSQL 11.x (including PostGIS 2.5)
 - Redis 5.0.x