Update ruby #16648
Merged
Update ruby #16648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/ruby@91faf12: Merge pull request docker-library/ruby#447 from infosiftr/revert-breaks-security - docker-library/ruby@1db5a7b: Revert RUBY_MAJOR refactoring for 3.0
Diff for 0d85332:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 006c359..979cd72 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,27 +3,27 @@ GitRepo: https://github.com/docker-library/ruby.git
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: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
+GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
Directory: 3.0/alpine3.16
Tags: 3.0.7-bullseye, 3.0-bullseye, 3.0.7, 3.0
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
+GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
Directory: 3.0/bullseye
Tags: 3.0.7-buster, 3.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
+GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
Directory: 3.0/buster
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: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
+GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
Directory: 3.0/slim-bullseye
Tags: 3.0.7-slim-buster, 3.0-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
+GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
Directory: 3.0/slim-buster
Tags: 3.1.5-alpine3.18, 3.1-alpine3.18
diff --git a/ruby_3.0-alpine/Dockerfile b/ruby_3.0-alpine/Dockerfile
index 45dc15f..76f99ef 100644
--- a/ruby_3.0-alpine/Dockerfile
+++ b/ruby_3.0-alpine/Dockerfile
@@ -28,8 +28,8 @@ RUN set -eux; \
ENV LANG C.UTF-8
# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_MAJOR 3.0
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
@@ -67,7 +67,7 @@ RUN set -eux; \
zlib-dev \
; \
\
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
+ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
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 104bc54..ddf7161 100644
--- a/ruby_3.0-buster/Dockerfile
+++ b/ruby_3.0-buster/Dockerfile
@@ -17,8 +17,8 @@ RUN set -eux; \
ENV LANG C.UTF-8
# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_MAJOR 3.0
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
@@ -35,7 +35,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*; \
\
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
+ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
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 0d690e2..d2d74ca 100644
--- a/ruby_3.0-slim-buster/Dockerfile
+++ b/ruby_3.0-slim-buster/Dockerfile
@@ -31,8 +31,8 @@ RUN set -eux; \
ENV LANG C.UTF-8
# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_MAJOR 3.0
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
@@ -62,7 +62,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*; \
\
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
+ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
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 e98952d..7f8ba05 100644
--- a/ruby_3.0-slim/Dockerfile
+++ b/ruby_3.0-slim/Dockerfile
@@ -31,8 +31,8 @@ RUN set -eux; \
ENV LANG C.UTF-8
# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_MAJOR 3.0
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
@@ -62,7 +62,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*; \
\
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
+ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
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 f8645c1..1bbb0cb 100644
--- a/ruby_3.0/Dockerfile
+++ b/ruby_3.0/Dockerfile
@@ -17,8 +17,8 @@ RUN set -eux; \
ENV LANG C.UTF-8
# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/
+ENV RUBY_MAJOR 3.0
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
@@ -35,7 +35,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*; \
\
- wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
+ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \
echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
\
mkdir -p /usr/src/ruby; \Relevant Maintainers: |
LaurentGoderre
approved these changes
Apr 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Follow-up to #16646