Merge pull request #415 from sitano/ivan_ruby_bookworm

Add debian:bookworm
docker-library · Jun 13, 2023 · 65c8de9 · 65c8de9
2 parents d829e4c + ed1be47
commit 65c8de9
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 49 deletions.
diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile
diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile
diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile
diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile
diff --git a/3.1/buster/Dockerfile → 3.1/bookworm/Dockerfile b/3.1/buster/Dockerfile → 3.1/bookworm/Dockerfile
diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile
diff --git a/3.1/slim-buster/Dockerfile → 3.1/slim-bookworm/Dockerfile b/3.1/slim-buster/Dockerfile → 3.1/slim-bookworm/Dockerfile
diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile
diff --git a/3.2/buster/Dockerfile → 3.2/bookworm/Dockerfile b/3.2/buster/Dockerfile → 3.2/bookworm/Dockerfile
diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile
diff --git a/3.2/slim-buster/Dockerfile → 3.2/slim-bookworm/Dockerfile b/3.2/slim-buster/Dockerfile → 3.2/slim-bookworm/Dockerfile
diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile
diff --git a/3.3-rc/buster/Dockerfile → 3.3-rc/bookworm/Dockerfile b/3.3-rc/buster/Dockerfile → 3.3-rc/bookworm/Dockerfile
diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile
diff --git a/3.3-rc/slim-buster/Dockerfile → 3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-buster/Dockerfile → 3.3-rc/slim-bookworm/Dockerfile
diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -262,9 +262,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/versions.json b/versions.json
@@ -13,10 +13,10 @@
   "3.1": {
     "sha256": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],
@@ -57,10 +57,10 @@
     },
     "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],
@@ -101,10 +101,10 @@
     },
     "sha256": "ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb",
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "alpine3.18",
       "alpine3.17"
     ],

diff --git a/versions.sh b/versions.sh
@@ -70,9 +70,16 @@ for version in "${versions[@]}"; do
 			sha256: env.shaVal,
 			variants: [
 				(
-					"bullseye",
-					"buster",
-					empty # trailing comma hack
+					# https://bugs.ruby-lang.org/issues/18658
+					# https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174
+					if  "3.0" == env.version then
+						"bullseye",
+						"buster"
+					else
+						"bookworm",
+						"bullseye",
+						empty # trailing comma hack
+					end
 				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 				(
 					# Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0