Update ruby #14855
Merged
Update ruby #14855
Conversation
This file contains hidden or 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@65c8de9: Merge pull request docker-library/ruby#415 from sitano/ivan_ruby_bookworm - docker-library/ruby@ed1be47: Add debian:bookworm, drop buster
Diff for ee693b5:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9155216..35c1c2e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,22 +8,22 @@ Directory: 3.0/alpine3.16
Tags: 3.0.6-bullseye, 3.0-bullseye, 3.0.6, 3.0
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1cd75932f3d072dbbe2a866951fc47ff5a5bb2fc
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.0/bullseye
Tags: 3.0.6-buster, 3.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1cd75932f3d072dbbe2a866951fc47ff5a5bb2fc
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.0/buster
Tags: 3.0.6-slim-bullseye, 3.0-slim-bullseye, 3.0.6-slim, 3.0-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1cd75932f3d072dbbe2a866951fc47ff5a5bb2fc
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.0/slim-bullseye
Tags: 3.0.6-slim-buster, 3.0-slim-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1cd75932f3d072dbbe2a866951fc47ff5a5bb2fc
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.0/slim-buster
Tags: 3.1.4-alpine3.17, 3.1-alpine3.17
@@ -36,26 +36,26 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
Directory: 3.1/alpine3.18
-Tags: 3.1.4-bullseye, 3.1-bullseye, 3.1.4, 3.1
+Tags: 3.1.4-bookworm, 3.1-bookworm, 3.1.4, 3.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 564fdfe2e1451d2f56a815b1213e54c7f8639cb4
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.1/bookworm
+
+Tags: 3.1.4-bullseye, 3.1-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.1/bullseye
-Tags: 3.1.4-buster, 3.1-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 564fdfe2e1451d2f56a815b1213e54c7f8639cb4
-Directory: 3.1/buster
+Tags: 3.1.4-slim-bookworm, 3.1-slim-bookworm, 3.1.4-slim, 3.1-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.1/slim-bookworm
-Tags: 3.1.4-slim-bullseye, 3.1-slim-bullseye, 3.1.4-slim, 3.1-slim
+Tags: 3.1.4-slim-bullseye, 3.1-slim-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 564fdfe2e1451d2f56a815b1213e54c7f8639cb4
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.1/slim-bullseye
-Tags: 3.1.4-slim-buster, 3.1-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 564fdfe2e1451d2f56a815b1213e54c7f8639cb4
-Directory: 3.1/slim-buster
-
Tags: 3.2.2-alpine3.17, 3.2-alpine3.17, 3-alpine3.17, alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
@@ -66,26 +66,26 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
Directory: 3.2/alpine3.18
-Tags: 3.2.2-bullseye, 3.2-bullseye, 3-bullseye, bullseye, 3.2.2, 3.2, 3, latest
+Tags: 3.2.2-bookworm, 3.2-bookworm, 3-bookworm, bookworm, 3.2.2, 3.2, 3, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.2/bookworm
+
+Tags: 3.2.2-bullseye, 3.2-bullseye, 3-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4041b21f3e11111846e6b6043da2da92e1da7019
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.2/bullseye
-Tags: 3.2.2-buster, 3.2-buster, 3-buster, buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 4041b21f3e11111846e6b6043da2da92e1da7019
-Directory: 3.2/buster
+Tags: 3.2.2-slim-bookworm, 3.2-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.2.2-slim, 3.2-slim, 3-slim, slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.2/slim-bookworm
-Tags: 3.2.2-slim-bullseye, 3.2-slim-bullseye, 3-slim-bullseye, slim-bullseye, 3.2.2-slim, 3.2-slim, 3-slim, slim
+Tags: 3.2.2-slim-bullseye, 3.2-slim-bullseye, 3-slim-bullseye, slim-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4041b21f3e11111846e6b6043da2da92e1da7019
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.2/slim-bullseye
-Tags: 3.2.2-slim-buster, 3.2-slim-buster, 3-slim-buster, slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 4041b21f3e11111846e6b6043da2da92e1da7019
-Directory: 3.2/slim-buster
-
Tags: 3.3.0-preview1-alpine3.17, 3.3-rc-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
@@ -96,22 +96,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
Directory: 3.3-rc/alpine3.18
-Tags: 3.3.0-preview1-bullseye, 3.3-rc-bullseye, 3.3.0-preview1, 3.3-rc
+Tags: 3.3.0-preview1-bookworm, 3.3-rc-bookworm, 3.3.0-preview1, 3.3-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b0be6d1004b0c0665366402905347a85f115b324
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.3-rc/bookworm
+
+Tags: 3.3.0-preview1-bullseye, 3.3-rc-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.3-rc/bullseye
-Tags: 3.3.0-preview1-buster, 3.3-rc-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b0be6d1004b0c0665366402905347a85f115b324
-Directory: 3.3-rc/buster
+Tags: 3.3.0-preview1-slim-bookworm, 3.3-rc-slim-bookworm, 3.3.0-preview1-slim, 3.3-rc-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+Directory: 3.3-rc/slim-bookworm
-Tags: 3.3.0-preview1-slim-bullseye, 3.3-rc-slim-bullseye, 3.3.0-preview1-slim, 3.3-rc-slim
+Tags: 3.3.0-preview1-slim-bullseye, 3.3-rc-slim-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
+GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
Directory: 3.3-rc/slim-bullseye
-
-Tags: 3.3.0-preview1-slim-buster, 3.3-rc-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
-Directory: 3.3-rc/slim-buster
diff --git a/_bashbrew-list b/_bashbrew-list
index def04df..1b1a2e6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,11 +2,11 @@ ruby:3
ruby:3-alpine
ruby:3-alpine3.17
ruby:3-alpine3.18
+ruby:3-bookworm
ruby:3-bullseye
-ruby:3-buster
ruby:3-slim
+ruby:3-slim-bookworm
ruby:3-slim-bullseye
-ruby:3-slim-buster
ruby:3.0
ruby:3.0-alpine
ruby:3.0-alpine3.16
@@ -27,62 +27,62 @@ ruby:3.1
ruby:3.1-alpine
ruby:3.1-alpine3.17
ruby:3.1-alpine3.18
+ruby:3.1-bookworm
ruby:3.1-bullseye
-ruby:3.1-buster
ruby:3.1-slim
+ruby:3.1-slim-bookworm
ruby:3.1-slim-bullseye
-ruby:3.1-slim-buster
ruby:3.1.4
ruby:3.1.4-alpine
ruby:3.1.4-alpine3.17
ruby:3.1.4-alpine3.18
+ruby:3.1.4-bookworm
ruby:3.1.4-bullseye
-ruby:3.1.4-buster
ruby:3.1.4-slim
+ruby:3.1.4-slim-bookworm
ruby:3.1.4-slim-bullseye
-ruby:3.1.4-slim-buster
ruby:3.2
ruby:3.2-alpine
ruby:3.2-alpine3.17
ruby:3.2-alpine3.18
+ruby:3.2-bookworm
ruby:3.2-bullseye
-ruby:3.2-buster
ruby:3.2-slim
+ruby:3.2-slim-bookworm
ruby:3.2-slim-bullseye
-ruby:3.2-slim-buster
ruby:3.2.2
ruby:3.2.2-alpine
ruby:3.2.2-alpine3.17
ruby:3.2.2-alpine3.18
+ruby:3.2.2-bookworm
ruby:3.2.2-bullseye
-ruby:3.2.2-buster
ruby:3.2.2-slim
+ruby:3.2.2-slim-bookworm
ruby:3.2.2-slim-bullseye
-ruby:3.2.2-slim-buster
ruby:3.3-rc
ruby:3.3-rc-alpine
ruby:3.3-rc-alpine3.17
ruby:3.3-rc-alpine3.18
+ruby:3.3-rc-bookworm
ruby:3.3-rc-bullseye
-ruby:3.3-rc-buster
ruby:3.3-rc-slim
+ruby:3.3-rc-slim-bookworm
ruby:3.3-rc-slim-bullseye
-ruby:3.3-rc-slim-buster
ruby:3.3.0-preview1
ruby:3.3.0-preview1-alpine
ruby:3.3.0-preview1-alpine3.17
ruby:3.3.0-preview1-alpine3.18
+ruby:3.3.0-preview1-bookworm
ruby:3.3.0-preview1-bullseye
-ruby:3.3.0-preview1-buster
ruby:3.3.0-preview1-slim
+ruby:3.3.0-preview1-slim-bookworm
ruby:3.3.0-preview1-slim-bullseye
-ruby:3.3.0-preview1-slim-buster
ruby:alpine
ruby:alpine3.17
ruby:alpine3.18
+ruby:bookworm
ruby:bullseye
-ruby:buster
ruby:latest
ruby:slim
+ruby:slim-bookworm
ruby:slim-bullseye
-ruby:slim-buster
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 92b22b9..6702592 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -6,18 +6,18 @@ ruby:3.0-slim-buster
ruby:3.1-alpine3.17
ruby:3.1-alpine
ruby:3.1
-ruby:3.1-buster
+ruby:3.1-bullseye
ruby:3.1-slim
-ruby:3.1-slim-buster
+ruby:3.1-slim-bullseye
ruby:alpine3.17
ruby:alpine
ruby:latest
-ruby:buster
+ruby:bullseye
ruby:slim
-ruby:slim-buster
+ruby:slim-bullseye
ruby:3.3-rc-alpine3.17
ruby:3.3-rc-alpine
ruby:3.3-rc
-ruby:3.3-rc-buster
+ruby:3.3-rc-bullseye
ruby:3.3-rc-slim
-ruby:3.3-rc-slim-buster
+ruby:3.3-rc-slim-bullseye
diff --git a/ruby_3.0-buster/Dockerfile b/ruby_3.0-buster/Dockerfile
index 03abed0..0f67902 100644
--- a/ruby_3.0-buster/Dockerfile
+++ b/ruby_3.0-buster/Dockerfile
@@ -64,9 +64,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.0-slim-buster/Dockerfile b/ruby_3.0-slim-buster/Dockerfile
index 9f755b0..956097c 100644
--- a/ruby_3.0-slim-buster/Dockerfile
+++ b/ruby_3.0-slim-buster/Dockerfile
@@ -91,9 +91,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.0-slim/Dockerfile b/ruby_3.0-slim/Dockerfile
index 26b331f..66ab15e 100644
--- a/ruby_3.0-slim/Dockerfile
+++ b/ruby_3.0-slim/Dockerfile
@@ -91,9 +91,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.0/Dockerfile b/ruby_3.0/Dockerfile
index 3b917a9..a348d95 100644
--- a/ruby_3.0/Dockerfile
+++ b/ruby_3.0/Dockerfile
@@ -64,9 +64,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.1-buster/Dockerfile b/ruby_3.1-bullseye/Dockerfile
similarity index 94%
rename from ruby_3.1-buster/Dockerfile
rename to ruby_3.1-bullseye/Dockerfile
index f50561f..80f0ec1 100644
--- a/ruby_3.1-buster/Dockerfile
+++ b/ruby_3.1-bullseye/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; \
@@ -64,9 +64,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.1-slim-buster/Dockerfile b/ruby_3.1-slim-bullseye/Dockerfile
similarity index 95%
rename from ruby_3.1-slim-buster/Dockerfile
rename to ruby_3.1-slim-bullseye/Dockerfile
index 887f391..3462661 100644
--- a/ruby_3.1-slim-buster/Dockerfile
+++ b/ruby_3.1-slim-bullseye/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; \
@@ -91,9 +91,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.1-slim/Dockerfile b/ruby_3.1-slim/Dockerfile
index 9551c6b..fef9c14 100644
--- a/ruby_3.1-slim/Dockerfile
+++ b/ruby_3.1-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -91,9 +91,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.1/Dockerfile b/ruby_3.1/Dockerfile
index 5851055..97991aa 100644
--- a/ruby_3.1/Dockerfile
+++ b/ruby_3.1/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bullseye
+FROM buildpack-deps:bookworm
# skip installing gem documentation
RUN set -eux; \
@@ -64,9 +64,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.3-rc-buster/Dockerfile b/ruby_3.3-rc-bullseye/Dockerfile
similarity index 96%
rename from ruby_3.3-rc-buster/Dockerfile
rename to ruby_3.3-rc-bullseye/Dockerfile
index 905a428..eedcf34 100644
--- a/ruby_3.3-rc-buster/Dockerfile
+++ b/ruby_3.3-rc-bullseye/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; \
@@ -88,9 +88,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.3-rc-slim-buster/Dockerfile b/ruby_3.3-rc-slim-bullseye/Dockerfile
similarity index 96%
rename from ruby_3.3-rc-slim-buster/Dockerfile
rename to ruby_3.3-rc-slim-bullseye/Dockerfile
index 236bf39..c2f6993 100644
--- a/ruby_3.3-rc-slim-buster/Dockerfile
+++ b/ruby_3.3-rc-slim-bullseye/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; \
@@ -114,9 +114,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.3-rc-slim/Dockerfile b/ruby_3.3-rc-slim/Dockerfile
index 7a38e1f..c116a36 100644
--- a/ruby_3.3-rc-slim/Dockerfile
+++ b/ruby_3.3-rc-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -114,9 +114,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_3.3-rc/Dockerfile b/ruby_3.3-rc/Dockerfile
index ef2b7ce..9159abc 100644
--- a/ruby_3.3-rc/Dockerfile
+++ b/ruby_3.3-rc/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bullseye
+FROM buildpack-deps:bookworm
# skip installing gem documentation
RUN set -eux; \
@@ -88,9 +88,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_buster/Dockerfile b/ruby_bullseye/Dockerfile
similarity index 96%
rename from ruby_buster/Dockerfile
rename to ruby_bullseye/Dockerfile
index 48d07be..d4d54ff 100644
--- a/ruby_buster/Dockerfile
+++ b/ruby_bullseye/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; \
@@ -88,9 +88,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_latest/Dockerfile b/ruby_latest/Dockerfile
index 47d83c1..b56f1ce 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:bullseye
+FROM buildpack-deps:bookworm
# skip installing gem documentation
RUN set -eux; \
@@ -88,9 +88,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_slim-buster/Dockerfile b/ruby_slim-bullseye/Dockerfile
similarity index 96%
rename from ruby_slim-buster/Dockerfile
rename to ruby_slim-bullseye/Dockerfile
index 4eae3f5..775022a 100644
--- a/ruby_slim-buster/Dockerfile
+++ b/ruby_slim-bullseye/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; \
@@ -115,9 +115,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \
diff --git a/ruby_slim/Dockerfile b/ruby_slim/Dockerfile
index 6ca0fa2..9adf74d 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -115,9 +115,8 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
- | grep -vE '^/usr/local/lib/' \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
| sort -u \Relevant Maintainers: |
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: