Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[security] Update ruby #16646

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 23, 2024

Changes:

After this release, Ruby 3.0 reaches EOL. In other words, this is expected to be the last release of Ruby 3.0 series. We will not release Ruby 3.0.8 even if a security vulnerability is found (but could release if a severe regression is found). We recommend all Ruby 3.0 users to start migration to Ruby 3.3, 3.2, or 3.1 immediately.

https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/

Changes:

- docker-library/ruby@a2b957f: Merge pull request docker-library/ruby#446 from infosiftr/security
- docker-library/ruby@53646d3: [security] Update to 3.3.1, 3.2.4, 3.1.5, 3.0.7
@tianon tianon requested a review from a team as a code owner April 23, 2024 15:26
Copy link

Diff for c202be0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index de7a744..006c359 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,117 +1,117 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/ruby.git
 
-Tags: 3.0.6-alpine3.16, 3.0-alpine3.16, 3.0.6-alpine, 3.0-alpine
+Tags: 3.0.7-alpine3.16, 3.0-alpine3.16, 3.0.7-alpine, 3.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.0/alpine3.16
 
-Tags: 3.0.6-bullseye, 3.0-bullseye, 3.0.6, 3.0
+Tags: 3.0.7-bullseye, 3.0-bullseye, 3.0.7, 3.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.0/bullseye
 
-Tags: 3.0.6-buster, 3.0-buster
+Tags: 3.0.7-buster, 3.0-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.0/buster
 
-Tags: 3.0.6-slim-bullseye, 3.0-slim-bullseye, 3.0.6-slim, 3.0-slim
+Tags: 3.0.7-slim-bullseye, 3.0-slim-bullseye, 3.0.7-slim, 3.0-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.0/slim-bullseye
 
-Tags: 3.0.6-slim-buster, 3.0-slim-buster
+Tags: 3.0.7-slim-buster, 3.0-slim-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.0/slim-buster
 
-Tags: 3.1.4-alpine3.18, 3.1-alpine3.18
+Tags: 3.1.5-alpine3.18, 3.1-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/alpine3.18
 
-Tags: 3.1.4-alpine3.19, 3.1-alpine3.19, 3.1.4-alpine, 3.1-alpine
+Tags: 3.1.5-alpine3.19, 3.1-alpine3.19, 3.1.5-alpine, 3.1-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 61a806938da52038916a8fd7b9b4373937bdc28f
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/alpine3.19
 
-Tags: 3.1.4-bookworm, 3.1-bookworm, 3.1.4, 3.1
+Tags: 3.1.5-bookworm, 3.1-bookworm, 3.1.5, 3.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/bookworm
 
-Tags: 3.1.4-bullseye, 3.1-bullseye
+Tags: 3.1.5-bullseye, 3.1-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/bullseye
 
-Tags: 3.1.4-slim-bookworm, 3.1-slim-bookworm, 3.1.4-slim, 3.1-slim
+Tags: 3.1.5-slim-bookworm, 3.1-slim-bookworm, 3.1.5-slim, 3.1-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/slim-bookworm
 
-Tags: 3.1.4-slim-bullseye, 3.1-slim-bullseye
+Tags: 3.1.5-slim-bullseye, 3.1-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/slim-bullseye
 
-Tags: 3.2.3-alpine3.18, 3.2-alpine3.18
+Tags: 3.2.4-alpine3.18, 3.2-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c473741514de6aa1e3ccdf3a9c6df0aa71348ce3
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/alpine3.18
 
-Tags: 3.2.3-alpine3.19, 3.2-alpine3.19, 3.2.3-alpine, 3.2-alpine
+Tags: 3.2.4-alpine3.19, 3.2-alpine3.19, 3.2.4-alpine, 3.2-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c473741514de6aa1e3ccdf3a9c6df0aa71348ce3
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/alpine3.19
 
-Tags: 3.2.3-bookworm, 3.2-bookworm, 3.2.3, 3.2
+Tags: 3.2.4-bookworm, 3.2-bookworm, 3.2.4, 3.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/bookworm
 
-Tags: 3.2.3-bullseye, 3.2-bullseye
+Tags: 3.2.4-bullseye, 3.2-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/bullseye
 
-Tags: 3.2.3-slim-bookworm, 3.2-slim-bookworm, 3.2.3-slim, 3.2-slim
+Tags: 3.2.4-slim-bookworm, 3.2-slim-bookworm, 3.2.4-slim, 3.2-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/slim-bookworm
 
-Tags: 3.2.3-slim-bullseye, 3.2-slim-bullseye
+Tags: 3.2.4-slim-bullseye, 3.2-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/slim-bullseye
 
-Tags: 3.3.0-alpine3.18, 3.3-alpine3.18, 3-alpine3.18, alpine3.18
+Tags: 3.3.1-alpine3.18, 3.3-alpine3.18, 3-alpine3.18, alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7ac7122778cc764cd50271807efe2e94775b2c21
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/alpine3.18
 
-Tags: 3.3.0-alpine3.19, 3.3-alpine3.19, 3-alpine3.19, alpine3.19, 3.3.0-alpine, 3.3-alpine, 3-alpine, alpine
+Tags: 3.3.1-alpine3.19, 3.3-alpine3.19, 3-alpine3.19, alpine3.19, 3.3.1-alpine, 3.3-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7ac7122778cc764cd50271807efe2e94775b2c21
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/alpine3.19
 
-Tags: 3.3.0-bookworm, 3.3-bookworm, 3-bookworm, bookworm, 3.3.0, 3.3, 3, latest
+Tags: 3.3.1-bookworm, 3.3-bookworm, 3-bookworm, bookworm, 3.3.1, 3.3, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/bookworm
 
-Tags: 3.3.0-bullseye, 3.3-bullseye, 3-bullseye, bullseye
+Tags: 3.3.1-bullseye, 3.3-bullseye, 3-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/bullseye
 
-Tags: 3.3.0-slim-bookworm, 3.3-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.3.0-slim, 3.3-slim, 3-slim, slim
+Tags: 3.3.1-slim-bookworm, 3.3-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.3.1-slim, 3.3-slim, 3-slim, slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/slim-bookworm
 
-Tags: 3.3.0-slim-bullseye, 3.3-slim-bullseye, 3-slim-bullseye, slim-bullseye
+Tags: 3.3.1-slim-bullseye, 3.3-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 77efb18a0fb15955a4f77c9fa1d3968875915b78
+GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/slim-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 4c8006b..29a4a86 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -15,14 +15,14 @@ ruby:3.0-buster
 ruby:3.0-slim
 ruby:3.0-slim-bullseye
 ruby:3.0-slim-buster
-ruby:3.0.6
-ruby:3.0.6-alpine
-ruby:3.0.6-alpine3.16
-ruby:3.0.6-bullseye
-ruby:3.0.6-buster
-ruby:3.0.6-slim
-ruby:3.0.6-slim-bullseye
-ruby:3.0.6-slim-buster
+ruby:3.0.7
+ruby:3.0.7-alpine
+ruby:3.0.7-alpine3.16
+ruby:3.0.7-bullseye
+ruby:3.0.7-buster
+ruby:3.0.7-slim
+ruby:3.0.7-slim-bullseye
+ruby:3.0.7-slim-buster
 ruby:3.1
 ruby:3.1-alpine
 ruby:3.1-alpine3.18
@@ -32,15 +32,15 @@ ruby:3.1-bullseye
 ruby:3.1-slim
 ruby:3.1-slim-bookworm
 ruby:3.1-slim-bullseye
-ruby:3.1.4
-ruby:3.1.4-alpine
-ruby:3.1.4-alpine3.18
-ruby:3.1.4-alpine3.19
-ruby:3.1.4-bookworm
-ruby:3.1.4-bullseye
-ruby:3.1.4-slim
-ruby:3.1.4-slim-bookworm
-ruby:3.1.4-slim-bullseye
+ruby:3.1.5
+ruby:3.1.5-alpine
+ruby:3.1.5-alpine3.18
+ruby:3.1.5-alpine3.19
+ruby:3.1.5-bookworm
+ruby:3.1.5-bullseye
+ruby:3.1.5-slim
+ruby:3.1.5-slim-bookworm
+ruby:3.1.5-slim-bullseye
 ruby:3.2
 ruby:3.2-alpine
 ruby:3.2-alpine3.18
@@ -50,15 +50,15 @@ ruby:3.2-bullseye
 ruby:3.2-slim
 ruby:3.2-slim-bookworm
 ruby:3.2-slim-bullseye
-ruby:3.2.3
-ruby:3.2.3-alpine
-ruby:3.2.3-alpine3.18
-ruby:3.2.3-alpine3.19
-ruby:3.2.3-bookworm
-ruby:3.2.3-bullseye
-ruby:3.2.3-slim
-ruby:3.2.3-slim-bookworm
-ruby:3.2.3-slim-bullseye
+ruby:3.2.4
+ruby:3.2.4-alpine
+ruby:3.2.4-alpine3.18
+ruby:3.2.4-alpine3.19
+ruby:3.2.4-bookworm
+ruby:3.2.4-bullseye
+ruby:3.2.4-slim
+ruby:3.2.4-slim-bookworm
+ruby:3.2.4-slim-bullseye
 ruby:3.3
 ruby:3.3-alpine
 ruby:3.3-alpine3.18
@@ -68,15 +68,15 @@ ruby:3.3-bullseye
 ruby:3.3-slim
 ruby:3.3-slim-bookworm
 ruby:3.3-slim-bullseye
-ruby:3.3.0
-ruby:3.3.0-alpine
-ruby:3.3.0-alpine3.18
-ruby:3.3.0-alpine3.19
-ruby:3.3.0-bookworm
-ruby:3.3.0-bullseye
-ruby:3.3.0-slim
-ruby:3.3.0-slim-bookworm
-ruby:3.3.0-slim-bullseye
+ruby:3.3.1
+ruby:3.3.1-alpine
+ruby:3.3.1-alpine3.18
+ruby:3.3.1-alpine3.19
+ruby:3.3.1-bookworm
+ruby:3.3.1-bullseye
+ruby:3.3.1-slim
+ruby:3.3.1-slim-bookworm
+ruby:3.3.1-slim-bullseye
 ruby:alpine
 ruby:alpine3.18
 ruby:alpine3.19
diff --git a/ruby_3.0-alpine/Dockerfile b/ruby_3.0-alpine/Dockerfile
index 377e2f8..45dc15f 100644
--- a/ruby_3.0-alpine/Dockerfile
+++ b/ruby_3.0-alpine/Dockerfile
@@ -26,9 +26,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.0
-ENV RUBY_VERSION 3.0.6
-ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_VERSION 3.0.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -65,7 +67,7 @@ RUN set -eux; \
 		zlib-dev \
 	; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.0-buster/Dockerfile b/ruby_3.0-buster/Dockerfile
index becce5f..104bc54 100644
--- a/ruby_3.0-buster/Dockerfile
+++ b/ruby_3.0-buster/Dockerfile
@@ -15,9 +15,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.0
-ENV RUBY_VERSION 3.0.6
-ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_VERSION 3.0.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -33,7 +35,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.0-slim-buster/Dockerfile b/ruby_3.0-slim-buster/Dockerfile
index 3a49517..0d690e2 100644
--- a/ruby_3.0-slim-buster/Dockerfile
+++ b/ruby_3.0-slim-buster/Dockerfile
@@ -29,9 +29,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.0
-ENV RUBY_VERSION 3.0.6
-ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_VERSION 3.0.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -60,7 +62,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.0-slim/Dockerfile b/ruby_3.0-slim/Dockerfile
index 22bf722..e98952d 100644
--- a/ruby_3.0-slim/Dockerfile
+++ b/ruby_3.0-slim/Dockerfile
@@ -29,9 +29,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.0
-ENV RUBY_VERSION 3.0.6
-ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_VERSION 3.0.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -60,7 +62,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.0/Dockerfile b/ruby_3.0/Dockerfile
index e57c1e5..f8645c1 100644
--- a/ruby_3.0/Dockerfile
+++ b/ruby_3.0/Dockerfile
@@ -15,9 +15,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.0
-ENV RUBY_VERSION 3.0.6
-ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_VERSION 3.0.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -33,7 +35,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine/Dockerfile
index d5b4dbc..c965966 100644
--- a/ruby_3.1-alpine/Dockerfile
+++ b/ruby_3.1-alpine/Dockerfile
@@ -26,9 +26,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -65,7 +67,7 @@ RUN set -eux; \
 		zlib-dev \
 	; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1-alpine3.18/Dockerfile b/ruby_3.1-alpine3.18/Dockerfile
index 4bc3519..eed94cc 100644
--- a/ruby_3.1-alpine3.18/Dockerfile
+++ b/ruby_3.1-alpine3.18/Dockerfile
@@ -26,9 +26,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -65,7 +67,7 @@ RUN set -eux; \
 		zlib-dev \
 	; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1-bullseye/Dockerfile b/ruby_3.1-bullseye/Dockerfile
index 86c8a51..07bad76 100644
--- a/ruby_3.1-bullseye/Dockerfile
+++ b/ruby_3.1-bullseye/Dockerfile
@@ -15,9 +15,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -33,7 +35,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1-slim-bullseye/Dockerfile b/ruby_3.1-slim-bullseye/Dockerfile
index 9225a64..e442181 100644
--- a/ruby_3.1-slim-bullseye/Dockerfile
+++ b/ruby_3.1-slim-bullseye/Dockerfile
@@ -29,9 +29,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -60,7 +62,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1-slim/Dockerfile b/ruby_3.1-slim/Dockerfile
index 85cefcf..f6adcb6 100644
--- a/ruby_3.1-slim/Dockerfile
+++ b/ruby_3.1-slim/Dockerfile
@@ -29,9 +29,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -60,7 +62,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.1/Dockerfile b/ruby_3.1/Dockerfile
index 48af0cc..8d4fe5c 100644
--- a/ruby_3.1/Dockerfile
+++ b/ruby_3.1/Dockerfile
@@ -15,9 +15,11 @@ RUN set -eux; \
 	} >> /usr/local/etc/gemrc
 
 ENV LANG C.UTF-8
-ENV RUBY_MAJOR 3.1
-ENV RUBY_VERSION 3.1.4
-ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f
+
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
+ENV RUBY_VERSION 3.1.5
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -33,7 +35,7 @@ RUN set -eux; \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
-	wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
+	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
 	\
 	mkdir -p /usr/src/ruby; \
diff --git a/ruby_3.2-alpine/Dockerfile b/ruby_3.2-alpine/Dockerfile
index a8b51c1..a8c92e9 100644
--- a/ruby_3.2-alpine/Dockerfile
+++ b/ruby_3.2-alpine/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_3.2-alpine3.18/Dockerfile b/ruby_3.2-alpine3.18/Dockerfile
index 800f1b6..b7ad3ec 100644
--- a/ruby_3.2-alpine3.18/Dockerfile
+++ b/ruby_3.2-alpine3.18/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_3.2-bullseye/Dockerfile b/ruby_3.2-bullseye/Dockerfile
index fe861df..2b070f6 100644
--- a/ruby_3.2-bullseye/Dockerfile
+++ b/ruby_3.2-bullseye/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_3.2-slim-bullseye/Dockerfile b/ruby_3.2-slim-bullseye/Dockerfile
index 679b050..23897b7 100644
--- a/ruby_3.2-slim-bullseye/Dockerfile
+++ b/ruby_3.2-slim-bullseye/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_3.2-slim/Dockerfile b/ruby_3.2-slim/Dockerfile
index e5a9175..bf66d8d 100644
--- a/ruby_3.2-slim/Dockerfile
+++ b/ruby_3.2-slim/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_3.2/Dockerfile b/ruby_3.2/Dockerfile
index f445dd9..74ce1a0 100644
--- a/ruby_3.2/Dockerfile
+++ b/ruby_3.2/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/
-ENV RUBY_VERSION 3.2.3
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
+ENV RUBY_VERSION 3.2.4
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index 3c2de30..40fcaab 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -116,14 +116,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
diff --git a/ruby_alpine3.18/Dockerfile b/ruby_alpine3.18/Dockerfile
index 691fd02..324bd23 100644
--- a/ruby_alpine3.18/Dockerfile
+++ b/ruby_alpine3.18/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -116,14 +116,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
diff --git a/ruby_bullseye/Dockerfile b/ruby_bullseye/Dockerfile
index 89bb994..f03e56f 100644
--- a/ruby_bullseye/Dockerfile
+++ b/ruby_bullseye/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -74,14 +74,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
diff --git a/ruby_latest/Dockerfile b/ruby_latest/Dockerfile
index 4444081..edccd88 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -74,14 +74,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
diff --git a/ruby_slim-bullseye/Dockerfile b/ruby_slim-bullseye/Dockerfile
index 8d3744e..436b9af 100644
--- a/ruby_slim-bullseye/Dockerfile
+++ b/ruby_slim-bullseye/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -100,14 +100,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \
diff --git a/ruby_slim/Dockerfile b/ruby_slim/Dockerfile
index 10d00de..5af2387 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
-ENV RUBY_VERSION 3.3.0
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b
+# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
+ENV RUBY_VERSION 3.3.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b
 
 # some of ruby's build scripts are written in ruby
 #   we purge system ruby later to make sure our final image uses what we just built
@@ -100,14 +100,6 @@ RUN set -eux; \
 	} > file.c.new; \
 	mv file.c.new file.c; \
 	\
-	# workaround crash on arm64
-	# https://bugs.ruby-lang.org/issues/20085
-	# https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371
-	wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \
-	echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \
-	patch -p1 -i arm64-fix.patch; \
-	rm arm64-fix.patch; \
-	\
 	autoconf; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	./configure \

Relevant Maintainers:

@LaurentGoderre
Copy link
Member

Minor issue is that any upstream image using the RUBY_MAJOR env that isn't there anymore would break. The name of the variable is a bit odd though.

@tianon
Copy link
Member Author

tianon commented Apr 23, 2024

Only on 3.1 and 3.0 where that change hadn't applied yet. We could make a pretty good argument for skipping it on these two releases (especially 3.0), but I think we should get this in first and then worry about that since we're not removing anything for the EOL yet so a follow up is pretty easy.

@tianon tianon merged commit bb7bb72 into docker-library:master Apr 23, 2024
28 checks passed
@tianon tianon deleted the ruby branch April 23, 2024 15:47
@tianon tianon mentioned this pull request Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants