From 9a9efe06150ce464f288617c8e3ec765bb93250e Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 13 Jun 2023 14:22:12 -0700 Subject: [PATCH] Add Debian bookworm, drop buster --- 2.7/{buster => bookworm}/Dockerfile | 4 ++-- 2.7/bullseye/Dockerfile | 2 +- 2.7/{slim-buster => slim-bookworm}/Dockerfile | 4 ++-- 2.7/slim-bullseye/Dockerfile | 2 +- 3.8/{buster => bookworm}/Dockerfile | 4 ++-- 3.8/bullseye/Dockerfile | 2 +- 3.8/{slim-buster => slim-bookworm}/Dockerfile | 4 ++-- 3.8/slim-bullseye/Dockerfile | 2 +- 3.9/{buster => bookworm}/Dockerfile | 4 ++-- 3.9/bullseye/Dockerfile | 2 +- 3.9/{slim-buster => slim-bookworm}/Dockerfile | 4 ++-- 3.9/slim-bullseye/Dockerfile | 2 +- Dockerfile-linux.template | 2 +- versions.json | 12 ++++++------ versions.sh | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) rename 2.7/{buster => bookworm}/Dockerfile (96%) rename 2.7/{slim-buster => slim-bookworm}/Dockerfile (96%) rename 3.8/{buster => bookworm}/Dockerfile (96%) rename 3.8/{slim-buster => slim-bookworm}/Dockerfile (97%) rename 3.9/{buster => bookworm}/Dockerfile (96%) rename 3.9/{slim-buster => slim-bookworm}/Dockerfile (97%) diff --git a/2.7/buster/Dockerfile b/2.7/bookworm/Dockerfile similarity index 96% rename from 2.7/buster/Dockerfile rename to 2.7/bookworm/Dockerfile index 8999c5c..61bfe50 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # runtime dependencies RUN set -eux; \ @@ -74,7 +74,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/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index f127e93..4459349 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -74,7 +74,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/2.7/slim-buster/Dockerfile b/2.7/slim-bookworm/Dockerfile similarity index 96% rename from 2.7/slim-buster/Dockerfile rename to 2.7/slim-bookworm/Dockerfile index a5085e5..036a597 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -72,7 +72,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/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index b60ec6f..f896837 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -72,7 +72,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/3.8/buster/Dockerfile b/3.8/bookworm/Dockerfile similarity index 96% rename from 3.8/buster/Dockerfile rename to 3.8/bookworm/Dockerfile index 84f61e9..00cdb19 100644 --- a/3.8/buster/Dockerfile +++ b/3.8/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # runtime dependencies RUN set -eux; \ @@ -93,7 +93,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/3.8/bullseye/Dockerfile b/3.8/bullseye/Dockerfile index 5090d50..81c4895 100644 --- a/3.8/bullseye/Dockerfile +++ b/3.8/bullseye/Dockerfile @@ -93,7 +93,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/3.8/slim-buster/Dockerfile b/3.8/slim-bookworm/Dockerfile similarity index 97% rename from 3.8/slim-buster/Dockerfile rename to 3.8/slim-bookworm/Dockerfile index 20a5a3e..72d73c3 100644 --- a/3.8/slim-buster/Dockerfile +++ b/3.8/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -95,7 +95,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/3.8/slim-bullseye/Dockerfile b/3.8/slim-bullseye/Dockerfile index e3e171f..bb5bf94 100644 --- a/3.8/slim-bullseye/Dockerfile +++ b/3.8/slim-bullseye/Dockerfile @@ -95,7 +95,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/3.9/buster/Dockerfile b/3.9/bookworm/Dockerfile similarity index 96% rename from 3.9/buster/Dockerfile rename to 3.9/bookworm/Dockerfile index 0b57782..7b13a09 100644 --- a/3.9/buster/Dockerfile +++ b/3.9/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # runtime dependencies RUN set -eux; \ @@ -93,7 +93,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/3.9/bullseye/Dockerfile b/3.9/bullseye/Dockerfile index 0c9c0b4..6c10171 100644 --- a/3.9/bullseye/Dockerfile +++ b/3.9/bullseye/Dockerfile @@ -93,7 +93,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/3.9/slim-buster/Dockerfile b/3.9/slim-bookworm/Dockerfile similarity index 97% rename from 3.9/slim-buster/Dockerfile rename to 3.9/slim-bookworm/Dockerfile index cf02b88..f305597 100644 --- a/3.9/slim-buster/Dockerfile +++ b/3.9/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -95,7 +95,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/3.9/slim-bullseye/Dockerfile b/3.9/slim-bullseye/Dockerfile index 201737d..93983cd 100644 --- a/3.9/slim-bullseye/Dockerfile +++ b/3.9/slim-bullseye/Dockerfile @@ -95,7 +95,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/Dockerfile-linux.template b/Dockerfile-linux.template index a187859..bd15752 100644 --- 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 index cdc27cf..f6c7cd0 100644 --- 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 index e6d0aa0..a6fea18 100755 --- a/versions.sh +++ b/versions.sh @@ -110,8 +110,8 @@ for version in "${versions[@]}"; do }, variants: [ ( + "bookworm", "bullseye", - "buster", empty # trailing comma | ., "slim-" + .),