diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 6bd14bd..dacc4b6 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added #RUN groupadd -r www-data && useradd -r --create-home -g www-data www-data @@ -85,7 +85,7 @@ RUN set -eux; \ # see https://httpd.apache.org/download.cgi#verify ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ -# $ docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }' +# $ docker run --rm buildpack-deps:bookworm-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }' for key in \ # Rodent of Unusual Size (DSA) DE29FB3971E71543FD2DC049508EAEC5302DA568 \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 949a741..5694d7d 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ # see https://httpd.apache.org/download.cgi#verify ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \ export GNUPGHOME="$(mktemp -d)"; \ -# $ docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }' +# $ docker run --rm buildpack-deps:bookworm-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }' for key in \ # Rodent of Unusual Size (DSA) DE29FB3971E71543FD2DC049508EAEC5302DA568 \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 9c394ca..784b127 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" - suite="${variantParent#*:}" # "bullseye-slim", "bullseye" - suite="${suite%-slim}" # "bullseye" + suite="${variantParent#*:}" # "bookworm-slim", "bookworm" + suite="${suite%-slim}" # "bookworm" if [ "$variant" = 'alpine' ]; then suite="alpine$suite" # "alpine3.15"