From 5eff8e128a75c888ef91646dd293be4a43bcf873 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Fri, 27 Dec 2024 13:51:57 -0500
Subject: [PATCH] bump rubies:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 3.4.0 → 3.4.1
- 3.3.5 → 3.3.5 [^1]
- 3.2.0 → 3.2.6
- 3.1.0 → 3.1.2 [^2]
- 3.0.0 → 3.0.7
- 2.7.0 → 2.7.8
- 2.6.0 → 2.6.10
- 2.5.0 → 2.5.9
- 2.4.0 → 2.4.10

And update the default rbenv from 3.1.3 to 3.1.6.

[^1]: unchanged
[^2]: not the latest 3.1.6 because ruby/ruby#6193 broke
      cross-compilation builds until it was fixed in 3.2.0.rc2 by
      ruby/ruby#6944 and ruby/ruby#6959 which weren't backported
      (see https://bugs.ruby-lang.org/issues/19239)
---
 Dockerfile.mri.erb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.mri.erb b/Dockerfile.mri.erb
index 68b1714..20963a7 100644
--- a/Dockerfile.mri.erb
+++ b/Dockerfile.mri.erb
@@ -15,7 +15,7 @@ RUN apt-get -y update && \
 ##
 RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
 
-ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.3"
+ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.6"
 
 # chown after running `rbenv init` because that command creates some subdirectories
 RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
@@ -109,19 +109,19 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 #
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
-    # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.4.0:3.3.5:3.2.0:3.1.0", "3.1.3"],
+    # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
+    ["3.4.1:3.3.5:3.2.6:3.1.2", "3.1.6"],
   ]
 elsif platform =~ /x64-mingw32/
   [
-    # Rubyinstaller prior to 3.1.0 is platform x64-mingw32
-    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.0.0:2.7.0", "3.1.3"],
+    # Rubyinstaller prior to 3.1 is platform x64-mingw32
+    ["2.6.10:2.5.9:2.4.10", "2.5.9"],
+    ["3.0.7:2.7.8", "3.1.6"],
   ]
 else
   [
-    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
+    ["2.6.10:2.5.9:2.4.10", "2.5.9"],
+    ["3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8", "3.1.6"],
   ]
 end
 
@@ -215,8 +215,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-RUN bash -c "rbenv global 3.1.3"
+RUN bash -c "rbenv global 3.1.6"
 
-ENV RUBY_CC_VERSION=3.4.0:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
+ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10
 
 CMD bash