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

Update ruby #18251

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Update ruby #18251

merged 1 commit into from
Jan 17, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 16, 2025

Changes:

Changes:

- docker-library/ruby@59bb4e0: Update 3.3 to 3.3.7
@tianon tianon requested review from LaurentGoderre and a team as code owners January 16, 2025 16:21
Copy link

Diff for c680f32:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f11795d..a5d4bc5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -61,34 +61,34 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/slim-bullseye
 
-Tags: 3.3.6-alpine3.20, 3.3-alpine3.20
+Tags: 3.3.7-alpine3.20, 3.3-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/alpine3.20
 
-Tags: 3.3.6-alpine3.21, 3.3-alpine3.21, 3.3.6-alpine, 3.3-alpine
+Tags: 3.3.7-alpine3.21, 3.3-alpine3.21, 3.3.7-alpine, 3.3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/alpine3.21
 
-Tags: 3.3.6-bookworm, 3.3-bookworm, 3.3.6, 3.3
+Tags: 3.3.7-bookworm, 3.3-bookworm, 3.3.7, 3.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/bookworm
 
-Tags: 3.3.6-bullseye, 3.3-bullseye
+Tags: 3.3.7-bullseye, 3.3-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/bullseye
 
-Tags: 3.3.6-slim-bookworm, 3.3-slim-bookworm, 3.3.6-slim, 3.3-slim
+Tags: 3.3.7-slim-bookworm, 3.3-slim-bookworm, 3.3.7-slim, 3.3-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/slim-bookworm
 
-Tags: 3.3.6-slim-bullseye, 3.3-slim-bullseye
+Tags: 3.3.7-slim-bullseye, 3.3-slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
+GitCommit: 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d
 Directory: 3.3/slim-bullseye
 
 Tags: 3.4.1-alpine3.20, 3.4-alpine3.20, 3-alpine3.20, alpine3.20
diff --git a/_bashbrew-list b/_bashbrew-list
index 6290b64..d3fd5e8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -52,15 +52,15 @@ ruby:3.3-bullseye
 ruby:3.3-slim
 ruby:3.3-slim-bookworm
 ruby:3.3-slim-bullseye
-ruby:3.3.6
-ruby:3.3.6-alpine
-ruby:3.3.6-alpine3.20
-ruby:3.3.6-alpine3.21
-ruby:3.3.6-bookworm
-ruby:3.3.6-bullseye
-ruby:3.3.6-slim
-ruby:3.3.6-slim-bookworm
-ruby:3.3.6-slim-bullseye
+ruby:3.3.7
+ruby:3.3.7-alpine
+ruby:3.3.7-alpine3.20
+ruby:3.3.7-alpine3.21
+ruby:3.3.7-bookworm
+ruby:3.3.7-bullseye
+ruby:3.3.7-slim
+ruby:3.3.7-slim-bookworm
+ruby:3.3.7-slim-bullseye
 ruby:3.4
 ruby:3.4-alpine
 ruby:3.4-alpine3.20
diff --git a/ruby_3.3-alpine/Dockerfile b/ruby_3.3-alpine/Dockerfile
index 5677ccf..55a0d9a 100644
--- a/ruby_3.3-alpine/Dockerfile
+++ b/ruby_3.3-alpine/Dockerfile
@@ -13,10 +13,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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
@@ -113,19 +113,6 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
-# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
-# - /~https://github.com/docker-library/ruby/pull/493
-# - /~https://github.com/docker-library/ruby/pull/497
-	apk add --no-cache --virtual .ruby-493-backcompat \
-		bzip2 \
-		ca-certificates \
-		gmp-dev \
-		libffi-dev \
-		procps \
-		yaml-dev \
-		zlib-dev \
-	; \
-	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
diff --git a/ruby_3.3-alpine3.20/Dockerfile b/ruby_3.3-alpine3.20/Dockerfile
index d29ad2e..c910b9b 100644
--- a/ruby_3.3-alpine3.20/Dockerfile
+++ b/ruby_3.3-alpine3.20/Dockerfile
@@ -13,10 +13,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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
@@ -113,19 +113,6 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
-# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
-# - /~https://github.com/docker-library/ruby/pull/493
-# - /~https://github.com/docker-library/ruby/pull/497
-	apk add --no-cache --virtual .ruby-493-backcompat \
-		bzip2 \
-		ca-certificates \
-		gmp-dev \
-		libffi-dev \
-		procps \
-		yaml-dev \
-		zlib-dev \
-	; \
-	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
diff --git a/ruby_3.3-bullseye/Dockerfile b/ruby_3.3-bullseye/Dockerfile
index 808e9e2..e318266 100644
--- a/ruby_3.3-bullseye/Dockerfile
+++ b/ruby_3.3-bullseye/Dockerfile
@@ -13,10 +13,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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.3-slim-bullseye/Dockerfile b/ruby_3.3-slim-bullseye/Dockerfile
index 2969f9b..2efbb2d 100644
--- a/ruby_3.3-slim-bullseye/Dockerfile
+++ b/ruby_3.3-slim-bullseye/Dockerfile
@@ -20,10 +20,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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
@@ -106,20 +106,6 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
-# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
-# - /~https://github.com/docker-library/ruby/pull/493
-# - /~https://github.com/docker-library/ruby/pull/497
-	savedAptMark="$savedAptMark \
-		bzip2 \
-		libffi-dev \
-		libgmp-dev \
-		libssl-dev \
-		libyaml-dev \
-		procps \
-		zlib1g-dev \
-	"; \
-	apt-get install -y --no-install-recommends $savedAptMark; \
-	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/ruby_3.3-slim/Dockerfile b/ruby_3.3-slim/Dockerfile
index c3f0e9d..a99ba66 100644
--- a/ruby_3.3-slim/Dockerfile
+++ b/ruby_3.3-slim/Dockerfile
@@ -20,10 +20,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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
@@ -106,20 +106,6 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
-# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
-# - /~https://github.com/docker-library/ruby/pull/493
-# - /~https://github.com/docker-library/ruby/pull/497
-	savedAptMark="$savedAptMark \
-		bzip2 \
-		libffi-dev \
-		libgmp-dev \
-		libssl-dev \
-		libyaml-dev \
-		procps \
-		zlib1g-dev \
-	"; \
-	apt-get install -y --no-install-recommends $savedAptMark; \
-	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/ruby_3.3/Dockerfile b/ruby_3.3/Dockerfile
index 4d0d7d7..5c7f020 100644
--- a/ruby_3.3/Dockerfile
+++ b/ruby_3.3/Dockerfile
@@ -13,10 +13,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/
-ENV RUBY_VERSION 3.3.6
-ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz
-ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266
+# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
+ENV RUBY_VERSION 3.3.7
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72
 
 # 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

Relevant Maintainers:

@tianon
Copy link
Member Author

tianon commented Jan 16, 2025

As a reminder, and as seen in the diff above, this includes docker-library/ruby#497 (comment) (less packages in slim and alpine image variants).

@LaurentGoderre LaurentGoderre merged commit 450299a into docker-library:master Jan 17, 2025
29 checks passed
@LaurentGoderre LaurentGoderre deleted the ruby branch January 17, 2025 14:20
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