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.

Sign up for GitHub

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

Jump to bottom

Update ruby #16814

Merged
merged 1 commit into from
May 22, 2024
Merged

Update ruby #16814

merged 1 commit into from
May 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 22, 2024

Changes:

@docker-library-bot
Update ruby
6707aec 
Changes:

- docker-library/ruby@41c83e0: Merge pull request docker-library/ruby#457 from Earlopain/alpine-3.20
- docker-library/ruby@a4c6c26: Add alpine 3.20
- docker-library/ruby@6664377: Merge pull request docker-library/ruby#459 from Earlopain/drop-ruby-3.0
- docker-library/ruby@cfb3148: Drop Ruby 3.0
@tianon tianon requested a review from a team as a code owner May 22, 2024 21:12
@github-actions GitHub Actions
Copy link

Diff for 6707aec: 
diff --git a/_bashbrew-arches b/_bashbrew-arches
index bedcccb..3616e93 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,4 +6,5 @@ arm64v8
 i386
 mips64le
 ppc64le
+riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1d92d04..f72bd0c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,41 +1,16 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 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: 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: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
-Directory: 3.0/bullseye
-
-Tags: 3.0.7-buster, 3.0-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-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: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
-Directory: 3.0/slim-bullseye
-
-Tags: 3.0.7-slim-buster, 3.0-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1db5a7b341c03963ea27b0664f46bcf2e47c0912
-Directory: 3.0/slim-buster
-
-Tags: 3.1.5-alpine3.18, 3.1-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
-Directory: 3.1/alpine3.18
-
-Tags: 3.1.5-alpine3.19, 3.1-alpine3.19, 3.1.5-alpine, 3.1-alpine
+Tags: 3.1.5-alpine3.19, 3.1-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/alpine3.19
 
+Tags: 3.1.5-alpine3.20, 3.1-alpine3.20, 3.1.5-alpine, 3.1-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: a4c6c26df171630eca259b1254a8b374c2eb0a43
+Directory: 3.1/alpine3.20
+
 Tags: 3.1.5-bookworm, 3.1-bookworm, 3.1.5, 3.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
@@ -56,16 +31,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.1/slim-bullseye
 
-Tags: 3.2.4-alpine3.18, 3.2-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
-Directory: 3.2/alpine3.18
-
-Tags: 3.2.4-alpine3.19, 3.2-alpine3.19, 3.2.4-alpine, 3.2-alpine
+Tags: 3.2.4-alpine3.19, 3.2-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/alpine3.19
 
+Tags: 3.2.4-alpine3.20, 3.2-alpine3.20, 3.2.4-alpine, 3.2-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: a4c6c26df171630eca259b1254a8b374c2eb0a43
+Directory: 3.2/alpine3.20
+
 Tags: 3.2.4-bookworm, 3.2-bookworm, 3.2.4, 3.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
@@ -86,16 +61,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.2/slim-bullseye
 
-Tags: 3.3.1-alpine3.18, 3.3-alpine3.18, 3-alpine3.18, alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
-Directory: 3.3/alpine3.18
-
-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
+Tags: 3.3.1-alpine3.19, 3.3-alpine3.19, 3-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
 Directory: 3.3/alpine3.19
 
+Tags: 3.3.1-alpine3.20, 3.3-alpine3.20, 3-alpine3.20, alpine3.20, 3.3.1-alpine, 3.3-alpine, 3-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: a4c6c26df171630eca259b1254a8b374c2eb0a43
+Directory: 3.3/alpine3.20
+
 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: 53646d3dc96008bd20218a4d9aeb5695619fb4f7
@@ -116,16 +91,16 @@ 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
+Tags: 3.4.0-preview1-alpine3.19, 3.4-rc-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f
 Directory: 3.4-rc/alpine3.19
 
+Tags: 3.4.0-preview1-alpine3.20, 3.4-rc-alpine3.20, 3.4.0-preview1-alpine, 3.4-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: a4c6c26df171630eca259b1254a8b374c2eb0a43
+Directory: 3.4-rc/alpine3.20
+
 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
diff --git a/_bashbrew-list b/_bashbrew-list
index 9cf6d0f..d39c2c8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,32 +1,16 @@
 ruby:3
 ruby:3-alpine
-ruby:3-alpine3.18
 ruby:3-alpine3.19
+ruby:3-alpine3.20
 ruby:3-bookworm
 ruby:3-bullseye
 ruby:3-slim
 ruby:3-slim-bookworm
 ruby:3-slim-bullseye
-ruby:3.0
-ruby:3.0-alpine
-ruby:3.0-alpine3.16
-ruby:3.0-bullseye
-ruby:3.0-buster
-ruby:3.0-slim
-ruby:3.0-slim-bullseye
-ruby:3.0-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
 ruby:3.1-alpine3.19
+ruby:3.1-alpine3.20
 ruby:3.1-bookworm
 ruby:3.1-bullseye
 ruby:3.1-slim
@@ -34,8 +18,8 @@ ruby:3.1-slim-bookworm
 ruby:3.1-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-alpine3.20
 ruby:3.1.5-bookworm
 ruby:3.1.5-bullseye
 ruby:3.1.5-slim
@@ -43,8 +27,8 @@ ruby:3.1.5-slim-bookworm
 ruby:3.1.5-slim-bullseye
 ruby:3.2
 ruby:3.2-alpine
-ruby:3.2-alpine3.18
 ruby:3.2-alpine3.19
+ruby:3.2-alpine3.20
 ruby:3.2-bookworm
 ruby:3.2-bullseye
 ruby:3.2-slim
@@ -52,8 +36,8 @@ ruby:3.2-slim-bookworm
 ruby:3.2-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-alpine3.20
 ruby:3.2.4-bookworm
 ruby:3.2.4-bullseye
 ruby:3.2.4-slim
@@ -61,8 +45,8 @@ ruby:3.2.4-slim-bookworm
 ruby:3.2.4-slim-bullseye
 ruby:3.3
 ruby:3.3-alpine
-ruby:3.3-alpine3.18
 ruby:3.3-alpine3.19
+ruby:3.3-alpine3.20
 ruby:3.3-bookworm
 ruby:3.3-bullseye
 ruby:3.3-slim
@@ -70,8 +54,8 @@ ruby:3.3-slim-bookworm
 ruby:3.3-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-alpine3.20
 ruby:3.3.1-bookworm
 ruby:3.3.1-bullseye
 ruby:3.3.1-slim
@@ -79,8 +63,8 @@ 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-alpine3.20
 ruby:3.4-rc-bookworm
 ruby:3.4-rc-bullseye
 ruby:3.4-rc-slim
@@ -88,16 +72,16 @@ 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-alpine3.20
 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
+ruby:alpine3.20
 ruby:bookworm
 ruby:bullseye
 ruby:latest
diff --git a/ruby_3.0-alpine/Dockerfile b/ruby_3.0-alpine/Dockerfile
deleted file mode 100644
index 76f99ef..0000000
diff --git a/ruby_3.0-buster/Dockerfile b/ruby_3.0-buster/Dockerfile
deleted file mode 100644
index ddf7161..0000000
diff --git a/ruby_3.0-slim-buster/Dockerfile b/ruby_3.0-slim-buster/Dockerfile
deleted file mode 100644
index d2d74ca..0000000
diff --git a/ruby_3.0-slim/Dockerfile b/ruby_3.0-slim/Dockerfile
deleted file mode 100644
index 7f8ba05..0000000
diff --git a/ruby_3.0/Dockerfile b/ruby_3.0/Dockerfile
deleted file mode 100644
index 1bbb0cb..0000000
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine/Dockerfile
index c965966..f8dbb65 100644
--- a/ruby_3.1-alpine/Dockerfile
+++ b/ruby_3.1-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/ruby_3.1-alpine3.18/Dockerfile b/ruby_3.1-alpine3.18/Dockerfile
deleted file mode 100644
index eed94cc..0000000
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine3.19/Dockerfile
similarity index 100%
copy from ruby_3.1-alpine/Dockerfile
copy to ruby_3.1-alpine3.19/Dockerfile
diff --git a/ruby_3.2-alpine/Dockerfile b/ruby_3.2-alpine/Dockerfile
index a8c92e9..acafda5 100644
--- a/ruby_3.2-alpine/Dockerfile
+++ b/ruby_3.2-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/ruby_3.2-alpine3.18/Dockerfile b/ruby_3.2-alpine3.18/Dockerfile
deleted file mode 100644
index b7ad3ec..0000000
diff --git a/ruby_3.2-alpine/Dockerfile b/ruby_3.2-alpine3.19/Dockerfile
similarity index 100%
copy from ruby_3.2-alpine/Dockerfile
copy to ruby_3.2-alpine3.19/Dockerfile
diff --git a/ruby_3.4-rc-alpine/Dockerfile b/ruby_3.4-rc-alpine/Dockerfile
index 9eb48f1..3417b89 100644
--- a/ruby_3.4-rc-alpine/Dockerfile
+++ b/ruby_3.4-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/ruby_3.4-rc-alpine3.18/Dockerfile b/ruby_3.4-rc-alpine3.18/Dockerfile
deleted file mode 100644
index 9931b5b..0000000
diff --git a/ruby_3.4-rc-alpine/Dockerfile b/ruby_3.4-rc-alpine3.19/Dockerfile
similarity index 100%
copy from ruby_3.4-rc-alpine/Dockerfile
copy to ruby_3.4-rc-alpine3.19/Dockerfile
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index 40fcaab..292ac67 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/ruby_alpine3.18/Dockerfile b/ruby_alpine3.18/Dockerfile
deleted file mode 100644
index 324bd23..0000000
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine3.19/Dockerfile
similarity index 100%
copy from ruby_alpine/Dockerfile
copy to ruby_alpine3.19/Dockerfile

Relevant Maintainers:

@yosifkit yosifkit merged commit 3941edd into docker-library:master May 22, 2024
29 checks passed
@yosifkit yosifkit deleted the ruby branch May 22, 2024 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/ruby
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot