Update ruby #10738
Merged
Update ruby #10738
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@301b52c: Merge pull request docker-library/ruby#357 from ojab/add_bullseye - docker-library/ruby@4916859: Add `bullseye` & `bullseye-slim` versions, drop `stretch` & `stretch-slim` - docker-library/ruby@fc5c093: Merge pull request docker-library/ruby#358 from infosiftr/confused - docker-library/ruby@e439599: Update patch file shasum
Diff for e217a75:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 57eb132..881c609 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,28 +8,28 @@ Directory: 2.6/alpine3.13
Tags: 2.6.8-alpine3.14, 2.6-alpine3.14, 2.6.8-alpine, 2.6-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
+GitCommit: e43959905d886946628d89f8e28d276af14a44a0
Directory: 2.6/alpine3.14
-Tags: 2.6.8-buster, 2.6-buster, 2.6.8, 2.6
+Tags: 2.6.8-bullseye, 2.6-bullseye, 2.6.8, 2.6
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 2.6/bullseye
+
+Tags: 2.6.8-buster, 2.6-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 761ae37f67acc54d49f085dc4e5a2443a77700e6
Directory: 2.6/buster
-Tags: 2.6.8-slim-buster, 2.6-slim-buster, 2.6.8-slim, 2.6-slim
+Tags: 2.6.8-slim-bullseye, 2.6-slim-bullseye, 2.6.8-slim, 2.6-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
-Directory: 2.6/slim-buster
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 2.6/slim-bullseye
-Tags: 2.6.8-slim-stretch, 2.6-slim-stretch
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
-Directory: 2.6/slim-stretch
-
-Tags: 2.6.8-stretch, 2.6-stretch
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 761ae37f67acc54d49f085dc4e5a2443a77700e6
-Directory: 2.6/stretch
+Tags: 2.6.8-slim-buster, 2.6-slim-buster
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 2.6/slim-buster
Tags: 2.7.4-alpine3.13, 2.7-alpine3.13, 2-alpine3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -41,14 +41,24 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
Directory: 2.7/alpine3.14
-Tags: 2.7.4-buster, 2.7-buster, 2-buster, 2.7.4, 2.7, 2
+Tags: 2.7.4-bullseye, 2.7-bullseye, 2-bullseye, 2.7.4, 2.7, 2
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 2.7/bullseye
+
+Tags: 2.7.4-buster, 2.7-buster, 2-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 761ae37f67acc54d49f085dc4e5a2443a77700e6
Directory: 2.7/buster
-Tags: 2.7.4-slim-buster, 2.7-slim-buster, 2-slim-buster, 2.7.4-slim, 2.7-slim, 2-slim
+Tags: 2.7.4-slim-bullseye, 2.7-slim-bullseye, 2-slim-bullseye, 2.7.4-slim, 2.7-slim, 2-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 2.7/slim-bullseye
+
+Tags: 2.7.4-slim-buster, 2.7-slim-buster, 2-slim-buster
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
Directory: 2.7/slim-buster
Tags: 3.0.2-alpine3.13, 3.0-alpine3.13, 3-alpine3.13, alpine3.13
@@ -61,12 +71,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
Directory: 3.0/alpine3.14
-Tags: 3.0.2-buster, 3.0-buster, 3-buster, buster, 3.0.2, 3.0, 3, latest
+Tags: 3.0.2-bullseye, 3.0-bullseye, 3-bullseye, bullseye, 3.0.2, 3.0, 3, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 3.0/bullseye
+
+Tags: 3.0.2-buster, 3.0-buster, 3-buster, buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 761ae37f67acc54d49f085dc4e5a2443a77700e6
Directory: 3.0/buster
-Tags: 3.0.2-slim-buster, 3.0-slim-buster, 3-slim-buster, slim-buster, 3.0.2-slim, 3.0-slim, 3-slim, slim
+Tags: 3.0.2-slim-bullseye, 3.0-slim-bullseye, 3-slim-bullseye, slim-bullseye, 3.0.2-slim, 3.0-slim, 3-slim, slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0c5948bcce84b1829a554209c777f0ef6a357dd2
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
+Directory: 3.0/slim-bullseye
+
+Tags: 3.0.2-slim-buster, 3.0-slim-buster, 3-slim-buster, slim-buster
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 49168590766ac3eb0ad286154b2e01760b79f4b2
Directory: 3.0/slim-buster
diff --git a/_bashbrew-list b/_bashbrew-list
index 5a2c220..ed4a1b4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,66 +2,80 @@ ruby:2
ruby:2-alpine
ruby:2-alpine3.13
ruby:2-alpine3.14
+ruby:2-bullseye
ruby:2-buster
ruby:2-slim
+ruby:2-slim-bullseye
ruby:2-slim-buster
ruby:2.6
ruby:2.6-alpine
ruby:2.6-alpine3.13
ruby:2.6-alpine3.14
+ruby:2.6-bullseye
ruby:2.6-buster
ruby:2.6-slim
+ruby:2.6-slim-bullseye
ruby:2.6-slim-buster
-ruby:2.6-slim-stretch
-ruby:2.6-stretch
ruby:2.6.8
ruby:2.6.8-alpine
ruby:2.6.8-alpine3.13
ruby:2.6.8-alpine3.14
+ruby:2.6.8-bullseye
ruby:2.6.8-buster
ruby:2.6.8-slim
+ruby:2.6.8-slim-bullseye
ruby:2.6.8-slim-buster
-ruby:2.6.8-slim-stretch
-ruby:2.6.8-stretch
ruby:2.7
ruby:2.7-alpine
ruby:2.7-alpine3.13
ruby:2.7-alpine3.14
+ruby:2.7-bullseye
ruby:2.7-buster
ruby:2.7-slim
+ruby:2.7-slim-bullseye
ruby:2.7-slim-buster
ruby:2.7.4
ruby:2.7.4-alpine
ruby:2.7.4-alpine3.13
ruby:2.7.4-alpine3.14
+ruby:2.7.4-bullseye
ruby:2.7.4-buster
ruby:2.7.4-slim
+ruby:2.7.4-slim-bullseye
ruby:2.7.4-slim-buster
ruby:3
ruby:3-alpine
ruby:3-alpine3.13
ruby:3-alpine3.14
+ruby:3-bullseye
ruby:3-buster
ruby:3-slim
+ruby:3-slim-bullseye
ruby:3-slim-buster
ruby:3.0
ruby:3.0-alpine
ruby:3.0-alpine3.13
ruby:3.0-alpine3.14
+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.2
ruby:3.0.2-alpine
ruby:3.0.2-alpine3.13
ruby:3.0.2-alpine3.14
+ruby:3.0.2-bullseye
ruby:3.0.2-buster
ruby:3.0.2-slim
+ruby:3.0.2-slim-bullseye
ruby:3.0.2-slim-buster
ruby:alpine
ruby:alpine3.13
ruby:alpine3.14
+ruby:bullseye
ruby:buster
ruby:latest
ruby:slim
+ruby:slim-bullseye
ruby:slim-buster
diff --git a/ruby_2/Dockerfile b/ruby_2-buster/Dockerfile
similarity index 100%
copy from ruby_2/Dockerfile
copy to ruby_2-buster/Dockerfile
diff --git a/ruby_2-slim/Dockerfile b/ruby_2-slim-buster/Dockerfile
similarity index 96%
copy from ruby_2-slim/Dockerfile
copy to ruby_2-slim-buster/Dockerfile
index e63c047..3b1825a 100644
--- a/ruby_2-slim/Dockerfile
+++ b/ruby_2-slim-buster/Dockerfile
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
@@ -56,8 +57,6 @@ RUN set -eux; \
make \
wget \
xz-utils \
-# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+)
- libgdbm-compat-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
diff --git a/ruby_2-slim/Dockerfile b/ruby_2-slim/Dockerfile
index e63c047..05e01ba 100644
--- a/ruby_2-slim/Dockerfile
+++ b/ruby_2-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
RUN set -eux; \
apt-get update; \
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
@@ -56,8 +57,6 @@ RUN set -eux; \
make \
wget \
xz-utils \
-# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+)
- libgdbm-compat-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
diff --git a/ruby_2.6-alpine/Dockerfile b/ruby_2.6-alpine/Dockerfile
index 53d1aef..cb90863 100644
--- a/ruby_2.6-alpine/Dockerfile
+++ b/ruby_2.6-alpine/Dockerfile
@@ -86,7 +86,7 @@ RUN set -eux; \
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
# https://github.com/ruby/ruby/pull/3773
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
- echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
+ echo '95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64 *autoconf-2.70.patch' | sha256sum --check --strict; \
patch -p1 -i autoconf-2.70.patch; \
rm autoconf-2.70.patch; \
\
diff --git a/ruby_2.6/Dockerfile b/ruby_2.6-buster/Dockerfile
similarity index 100%
copy from ruby_2.6/Dockerfile
copy to ruby_2.6-buster/Dockerfile
diff --git a/ruby_2.6-slim-stretch/Dockerfile b/ruby_2.6-slim-buster/Dockerfile
similarity index 98%
rename from ruby_2.6-slim-stretch/Dockerfile
rename to ruby_2.6-slim-buster/Dockerfile
index 88d1609..1e50d8f 100644
--- a/ruby_2.6-slim-stretch/Dockerfile
+++ b/ruby_2.6-slim-buster/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:stretch-slim
+FROM debian:buster-slim
RUN set -eux; \
apt-get update; \
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
diff --git a/ruby_2.6-slim/Dockerfile b/ruby_2.6-slim/Dockerfile
index 0c3b1a9..b2aa2cc 100644
--- a/ruby_2.6-slim/Dockerfile
+++ b/ruby_2.6-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
RUN set -eux; \
apt-get update; \
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
@@ -56,8 +57,6 @@ RUN set -eux; \
make \
wget \
xz-utils \
-# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+)
- libgdbm-compat-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
diff --git a/ruby_2.6-stretch/Dockerfile b/ruby_2.6-stretch/Dockerfile
deleted file mode 100644
index 73f9cfd..0000000
diff --git a/ruby_2.6/Dockerfile b/ruby_2.6/Dockerfile
index b9824a2..387c39d 100644
--- a/ruby_2.6/Dockerfile
+++ b/ruby_2.6/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bullseye
# skip installing gem documentation
RUN set -eux; \
diff --git a/ruby_2/Dockerfile b/ruby_2/Dockerfile
index f378063..6ebfaa0 100644
--- a/ruby_2/Dockerfile
+++ b/ruby_2/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bullseye
# skip installing gem documentation
RUN set -eux; \
diff --git a/ruby_latest/Dockerfile b/ruby_buster/Dockerfile
similarity index 100%
copy from ruby_latest/Dockerfile
copy to ruby_buster/Dockerfile
diff --git a/ruby_latest/Dockerfile b/ruby_latest/Dockerfile
index fe137bc..6cf1732 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bullseye
# skip installing gem documentation
RUN set -eux; \
diff --git a/ruby_slim/Dockerfile b/ruby_slim-buster/Dockerfile
similarity index 96%
copy from ruby_slim/Dockerfile
copy to ruby_slim-buster/Dockerfile
index 88b4e02..feef07b 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim-buster/Dockerfile
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
@@ -56,8 +57,6 @@ RUN set -eux; \
make \
wget \
xz-utils \
-# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+)
- libgdbm-compat-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
diff --git a/ruby_slim/Dockerfile b/ruby_slim/Dockerfile
index 88b4e02..a17b866 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
RUN set -eux; \
apt-get update; \
@@ -48,6 +48,7 @@ RUN set -eux; \
g++ \
gcc \
libbz2-dev \
+ libgdbm-compat-dev \
libglib2.0-dev \
libncurses-dev \
libreadline-dev \
@@ -56,8 +57,6 @@ RUN set -eux; \
make \
wget \
xz-utils \
-# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+)
- libgdbm-compat-dev \
; \
rm -rf /var/lib/apt/lists/*; \
\
|
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:
bullseye&bullseye-slimversions ruby#357 from ojab/add_bullseyebullseye&bullseye-slimversions, dropstretch&stretch-slim