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 #18163

Merged
Merged

Conversation

flavorjones
Copy link
Contributor

Changes:

Copy link

Diff for 57087ec:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3b4e5b7..1222809 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -61,62 +61,62 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.2/slim-bullseye
 
-Tags: 3.3.6-alpine3.20, 3.3-alpine3.20, 3-alpine3.20, alpine3.20
+Tags: 3.3.6-alpine3.20, 3.3-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/alpine3.20
 
-Tags: 3.3.6-alpine3.21, 3.3-alpine3.21, 3-alpine3.21, alpine3.21, 3.3.6-alpine, 3.3-alpine, 3-alpine, alpine
+Tags: 3.3.6-alpine3.21, 3.3-alpine3.21, 3.3.6-alpine, 3.3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/alpine3.21
 
-Tags: 3.3.6-bookworm, 3.3-bookworm, 3-bookworm, bookworm, 3.3.6, 3.3, 3, latest
+Tags: 3.3.6-bookworm, 3.3-bookworm, 3.3.6, 3.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/bookworm
 
-Tags: 3.3.6-bullseye, 3.3-bullseye, 3-bullseye, bullseye
+Tags: 3.3.6-bullseye, 3.3-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/bullseye
 
-Tags: 3.3.6-slim-bookworm, 3.3-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.3.6-slim, 3.3-slim, 3-slim, slim
+Tags: 3.3.6-slim-bookworm, 3.3-slim-bookworm, 3.3.6-slim, 3.3-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/slim-bookworm
 
-Tags: 3.3.6-slim-bullseye, 3.3-slim-bullseye, 3-slim-bullseye, slim-bullseye
+Tags: 3.3.6-slim-bullseye, 3.3-slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
 Directory: 3.3/slim-bullseye
 
-Tags: 3.4.0-rc1-alpine3.20, 3.4-rc-alpine3.20
+Tags: 3.4.1-alpine3.20, 3.4-alpine3.20, 3-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/alpine3.20
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/alpine3.20
 
-Tags: 3.4.0-rc1-alpine3.21, 3.4-rc-alpine3.21, 3.4.0-rc1-alpine, 3.4-rc-alpine
+Tags: 3.4.1-alpine3.21, 3.4-alpine3.21, 3-alpine3.21, alpine3.21, 3.4.1-alpine, 3.4-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/alpine3.21
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/alpine3.21
 
-Tags: 3.4.0-rc1-bookworm, 3.4-rc-bookworm, 3.4.0-rc1, 3.4-rc
+Tags: 3.4.1-bookworm, 3.4-bookworm, 3-bookworm, bookworm, 3.4.1, 3.4, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/bookworm
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/bookworm
 
-Tags: 3.4.0-rc1-bullseye, 3.4-rc-bullseye
+Tags: 3.4.1-bullseye, 3.4-bullseye, 3-bullseye, bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/bullseye
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/bullseye
 
-Tags: 3.4.0-rc1-slim-bookworm, 3.4-rc-slim-bookworm, 3.4.0-rc1-slim, 3.4-rc-slim
+Tags: 3.4.1-slim-bookworm, 3.4-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.4.1-slim, 3.4-slim, 3-slim, slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/slim-bookworm
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/slim-bookworm
 
-Tags: 3.4.0-rc1-slim-bullseye, 3.4-rc-slim-bullseye
+Tags: 3.4.1-slim-bullseye, 3.4-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3
-Directory: 3.4-rc/slim-bullseye
+GitCommit: 3caadc6cd9931b347181c517968c2ad414c49760
+Directory: 3.4/slim-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 5b0fd97..6290b64 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -61,24 +61,24 @@ ruby:3.3.6-bullseye
 ruby:3.3.6-slim
 ruby:3.3.6-slim-bookworm
 ruby:3.3.6-slim-bullseye
-ruby:3.4-rc
-ruby:3.4-rc-alpine
-ruby:3.4-rc-alpine3.20
-ruby:3.4-rc-alpine3.21
-ruby:3.4-rc-bookworm
-ruby:3.4-rc-bullseye
-ruby:3.4-rc-slim
-ruby:3.4-rc-slim-bookworm
-ruby:3.4-rc-slim-bullseye
-ruby:3.4.0-rc1
-ruby:3.4.0-rc1-alpine
-ruby:3.4.0-rc1-alpine3.20
-ruby:3.4.0-rc1-alpine3.21
-ruby:3.4.0-rc1-bookworm
-ruby:3.4.0-rc1-bullseye
-ruby:3.4.0-rc1-slim
-ruby:3.4.0-rc1-slim-bookworm
-ruby:3.4.0-rc1-slim-bullseye
+ruby:3.4
+ruby:3.4-alpine
+ruby:3.4-alpine3.20
+ruby:3.4-alpine3.21
+ruby:3.4-bookworm
+ruby:3.4-bullseye
+ruby:3.4-slim
+ruby:3.4-slim-bookworm
+ruby:3.4-slim-bullseye
+ruby:3.4.1
+ruby:3.4.1-alpine
+ruby:3.4.1-alpine3.20
+ruby:3.4.1-alpine3.21
+ruby:3.4.1-bookworm
+ruby:3.4.1-bullseye
+ruby:3.4.1-slim
+ruby:3.4.1-slim-bookworm
+ruby:3.4.1-slim-bullseye
 ruby:alpine
 ruby:alpine3.20
 ruby:alpine3.21
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 088f07d..c0e6027 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -10,12 +10,12 @@ ruby:3.2-alpine3.20
 ruby:3.2-bullseye
 ruby:3.2-slim
 ruby:3.2-slim-bullseye
-ruby:3.4-rc
-ruby:3.4-rc-alpine
-ruby:3.4-rc-alpine3.20
-ruby:3.4-rc-bullseye
-ruby:3.4-rc-slim
-ruby:3.4-rc-slim-bullseye
+ruby:3.3
+ruby:3.3-alpine
+ruby:3.3-alpine3.20
+ruby:3.3-bullseye
+ruby:3.3-slim
+ruby:3.3-slim-bullseye
 ruby:alpine
 ruby:alpine3.20
 ruby:bullseye
diff --git a/ruby_alpine/Dockerfile b/ruby_3.3-alpine/Dockerfile
similarity index 100%
copy from ruby_alpine/Dockerfile
copy to ruby_3.3-alpine/Dockerfile
diff --git a/ruby_alpine3.20/Dockerfile b/ruby_3.3-alpine3.20/Dockerfile
similarity index 100%
copy from ruby_alpine3.20/Dockerfile
copy to ruby_3.3-alpine3.20/Dockerfile
diff --git a/ruby_bullseye/Dockerfile b/ruby_3.3-bullseye/Dockerfile
similarity index 100%
copy from ruby_bullseye/Dockerfile
copy to ruby_3.3-bullseye/Dockerfile
diff --git a/ruby_slim-bullseye/Dockerfile b/ruby_3.3-slim-bullseye/Dockerfile
similarity index 100%
copy from ruby_slim-bullseye/Dockerfile
copy to ruby_3.3-slim-bullseye/Dockerfile
diff --git a/ruby_slim/Dockerfile b/ruby_3.3-slim/Dockerfile
similarity index 100%
copy from ruby_slim/Dockerfile
copy to ruby_3.3-slim/Dockerfile
diff --git a/ruby_latest/Dockerfile b/ruby_3.3/Dockerfile
similarity index 100%
copy from ruby_latest/Dockerfile
copy to ruby_3.3/Dockerfile
diff --git a/ruby_3.4-rc-alpine/Dockerfile b/ruby_3.4-rc-alpine/Dockerfile
deleted file mode 100644
index ae79b8a..0000000
diff --git a/ruby_3.4-rc-alpine3.20/Dockerfile b/ruby_3.4-rc-alpine3.20/Dockerfile
deleted file mode 100644
index 4d1ede4..0000000
diff --git a/ruby_3.4-rc-bullseye/Dockerfile b/ruby_3.4-rc-bullseye/Dockerfile
deleted file mode 100644
index e7ea548..0000000
diff --git a/ruby_3.4-rc-slim-bullseye/Dockerfile b/ruby_3.4-rc-slim-bullseye/Dockerfile
deleted file mode 100644
index 0238894..0000000
diff --git a/ruby_3.4-rc-slim/Dockerfile b/ruby_3.4-rc-slim/Dockerfile
deleted file mode 100644
index 10045e7..0000000
diff --git a/ruby_3.4-rc/Dockerfile b/ruby_3.4-rc/Dockerfile
deleted file mode 100644
index fea2d90..0000000
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index a12746b..826e727 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -24,10 +24,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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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_alpine3.20/Dockerfile b/ruby_alpine3.20/Dockerfile
index 4fdc15b..ff0e3a2 100644
--- a/ruby_alpine3.20/Dockerfile
+++ b/ruby_alpine3.20/Dockerfile
@@ -24,10 +24,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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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_bullseye/Dockerfile b/ruby_bullseye/Dockerfile
index 330629d..327b235 100644
--- a/ruby_bullseye/Dockerfile
+++ b/ruby_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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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_latest/Dockerfile b/ruby_latest/Dockerfile
index 1b70985..4566ff2 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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_slim-bullseye/Dockerfile b/ruby_slim-bullseye/Dockerfile
index d68cc7a..a00693b 100644
--- a/ruby_slim-bullseye/Dockerfile
+++ b/ruby_slim-bullseye/Dockerfile
@@ -27,10 +27,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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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_slim/Dockerfile b/ruby_slim/Dockerfile
index 6730cf4..b41f3d3 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -27,10 +27,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/2024/12/25/ruby-3-4-1-released/
+ENV RUBY_VERSION 3.4.1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af
 
 # 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:

@LaurentGoderre LaurentGoderre merged commit 3603454 into docker-library:master Dec 26, 2024
29 checks passed
@flavorjones flavorjones deleted the flavorjones-bump-ruby branch December 26, 2024 21:28
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.

2 participants