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

Merged
merged 1 commit into from
May 17, 2024
Merged

Update ruby #16779

merged 1 commit into from
May 17, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 16, 2024

Changes:

Changes:

- docker-library/ruby@2b7f2ce: Merge pull request docker-library/ruby#456 from infosiftr/3.4-rc
- docker-library/ruby@bfd3f47: Add 3.4.0-preview1
- docker-library/ruby@0d22570: Merge pull request docker-library/ruby#454 from Earlopain/bump-actions
- docker-library/ruby@b0fcebf: Bump `actions/checkout` to v4
- docker-library/ruby@f575343: Merge pull request docker-library/ruby#448 from Earlopain/cleanup-template
- docker-library/ruby@ed54bf2: Remove 3.3.0 arm64 patch
@tianon tianon requested a review from a team as a code owner May 16, 2024 23:20
Copy link

Diff for ea745cd:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 979cd72..1d92d04 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -115,3 +115,33 @@ 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: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/slim-bullseye
+
+Tags: 3.4.0-preview1-alpine3.18, 3.4-rc-alpine3.18
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/alpine3.18
+
+Tags: 3.4.0-preview1-alpine3.19, 3.4-rc-alpine3.19, 3.4.0-preview1-alpine, 3.4-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/alpine3.19
+
+Tags: 3.4.0-preview1-bookworm, 3.4-rc-bookworm, 3.4.0-preview1, 3.4-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/bookworm
+
+Tags: 3.4.0-preview1-bullseye, 3.4-rc-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/bullseye
+
+Tags: 3.4.0-preview1-slim-bookworm, 3.4-rc-slim-bookworm, 3.4.0-preview1-slim, 3.4-rc-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/slim-bookworm
+
+Tags: 3.4.0-preview1-slim-bullseye, 3.4-rc-slim-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
+Directory: 3.4-rc/slim-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 29a4a86..9cf6d0f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -77,6 +77,24 @@ ruby:3.3.1-bullseye
 ruby:3.3.1-slim
 ruby:3.3.1-slim-bookworm
 ruby:3.3.1-slim-bullseye
+ruby:3.4-rc
+ruby:3.4-rc-alpine
+ruby:3.4-rc-alpine3.18
+ruby:3.4-rc-alpine3.19
+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-preview1
+ruby:3.4.0-preview1-alpine
+ruby:3.4.0-preview1-alpine3.18
+ruby:3.4.0-preview1-alpine3.19
+ruby:3.4.0-preview1-bookworm
+ruby:3.4.0-preview1-bullseye
+ruby:3.4.0-preview1-slim
+ruby:3.4.0-preview1-slim-bookworm
+ruby:3.4.0-preview1-slim-bullseye
 ruby:alpine
 ruby:alpine3.18
 ruby:alpine3.19
diff --git a/ruby_alpine/Dockerfile b/ruby_3.4-rc-alpine/Dockerfile
similarity index 93%
copy from ruby_alpine/Dockerfile
copy to ruby_3.4-rc-alpine/Dockerfile
index 40fcaab..9eb48f1 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_3.4-rc-alpine/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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.18/Dockerfile b/ruby_3.4-rc-alpine3.18/Dockerfile
similarity index 93%
copy from ruby_alpine3.18/Dockerfile
copy to ruby_3.4-rc-alpine3.18/Dockerfile
index 324bd23..9931b5b 100644
--- a/ruby_alpine3.18/Dockerfile
+++ b/ruby_3.4-rc-alpine3.18/Dockerfile
@@ -27,10 +27,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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.4-rc-bullseye/Dockerfile
similarity index 92%
copy from ruby_3.2-bullseye/Dockerfile
copy to ruby_3.4-rc-bullseye/Dockerfile
index 2b070f6..bc900b2 100644
--- a/ruby_3.2-bullseye/Dockerfile
+++ b/ruby_3.4-rc-bullseye/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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
@@ -28,7 +28,6 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-		bison \
 		dpkg-dev \
 		libgdbm-dev \
 		ruby \
diff --git a/ruby_slim-bullseye/Dockerfile b/ruby_3.4-rc-slim-bullseye/Dockerfile
similarity index 93%
copy from ruby_slim-bullseye/Dockerfile
copy to ruby_3.4-rc-slim-bullseye/Dockerfile
index 436b9af..c7a4846 100644
--- a/ruby_slim-bullseye/Dockerfile
+++ b/ruby_3.4-rc-slim-bullseye/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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_3.4-rc-slim/Dockerfile
similarity index 93%
copy from ruby_slim/Dockerfile
copy to ruby_3.4-rc-slim/Dockerfile
index 5af2387..b74c10f 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_3.4-rc-slim/Dockerfile
@@ -30,10 +30,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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_3.4-rc/Dockerfile
similarity index 92%
copy from ruby_latest/Dockerfile
copy to ruby_3.4-rc/Dockerfile
index edccd88..4b736cb 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_3.4-rc/Dockerfile
@@ -16,10 +16,10 @@ RUN set -eux; \
 
 ENV LANG C.UTF-8
 
-# 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
+# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/
+ENV RUBY_VERSION 3.4.0-preview1
+ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz
+ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97
 
 # 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:

@yosifkit yosifkit merged commit 84e71d2 into docker-library:master May 17, 2024
34 checks passed
@yosifkit yosifkit deleted the ruby branch May 17, 2024 00:12
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.

None yet

3 participants