Add Debian bookworm, drop buster

docker-library · Jun 13, 2023 · 9a9efe0 · 9a9efe0
1 parent f297f09
commit 9a9efe0
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/2.7/buster/Dockerfile → 2.7/bookworm/Dockerfile b/2.7/buster/Dockerfile → 2.7/bookworm/Dockerfile
diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile
diff --git a/2.7/slim-buster/Dockerfile → 2.7/slim-bookworm/Dockerfile b/2.7/slim-buster/Dockerfile → 2.7/slim-bookworm/Dockerfile
diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile
diff --git a/3.8/buster/Dockerfile → 3.8/bookworm/Dockerfile b/3.8/buster/Dockerfile → 3.8/bookworm/Dockerfile
diff --git a/3.8/bullseye/Dockerfile b/3.8/bullseye/Dockerfile
diff --git a/3.8/slim-buster/Dockerfile → 3.8/slim-bookworm/Dockerfile b/3.8/slim-buster/Dockerfile → 3.8/slim-bookworm/Dockerfile
diff --git a/3.8/slim-bullseye/Dockerfile b/3.8/slim-bullseye/Dockerfile
diff --git a/3.9/buster/Dockerfile → 3.9/bookworm/Dockerfile b/3.9/buster/Dockerfile → 3.9/bookworm/Dockerfile
diff --git a/3.9/bullseye/Dockerfile b/3.9/bullseye/Dockerfile
diff --git a/3.9/slim-buster/Dockerfile → 3.9/slim-bookworm/Dockerfile b/3.9/slim-buster/Dockerfile → 3.9/slim-bookworm/Dockerfile
diff --git a/3.9/slim-bullseye/Dockerfile b/3.9/slim-bullseye/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -157,7 +157,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { print $(NF-1) }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
 		| sort -u \
 		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \

diff --git a/versions.json b/versions.json
@@ -40,10 +40,10 @@
       "version": "2.7.18"
     },
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],
@@ -90,10 +90,10 @@
       "version": "3.8.16"
     },
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],
@@ -140,10 +140,10 @@
       "version": "3.9.16"
     },
     "variants": [
+      "bookworm",
+      "slim-bookworm",
       "bullseye",
       "slim-bullseye",
-      "buster",
-      "slim-buster",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809"
     ],

diff --git a/versions.sh b/versions.sh
@@ -110,8 +110,8 @@ for version in "${versions[@]}"; do
 			},
 			variants: [
 				(
+					"bookworm",
 					"bullseye",
-					"buster",
 					empty # trailing comma
 				| ., "slim-" + .),