Skip to content

Commit c87146e

Browse files
committed
Update to Debian bookworm
1 parent d401fd6 commit c87146e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

2.4/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bullseye-slim
1+
FROM debian:bookworm-slim
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
#RUN groupadd -r www-data && useradd -r --create-home -g www-data www-data
@@ -85,7 +85,7 @@ RUN set -eux; \
8585
# see https://httpd.apache.org/download.cgi#verify
8686
ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \
8787
export GNUPGHOME="$(mktemp -d)"; \
88-
# $ 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 }'
88+
# $ 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 }'
8989
for key in \
9090
# Rodent of Unusual Size (DSA) <[email protected]>
9191
DE29FB3971E71543FD2DC049508EAEC5302DA568 \

2.4/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ RUN set -eux; \
9393
# see https://httpd.apache.org/download.cgi#verify
9494
ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \
9595
export GNUPGHOME="$(mktemp -d)"; \
96-
# $ 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 }'
96+
# $ 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 }'
9797
for key in \
9898
# Rodent of Unusual Size (DSA) <[email protected]>
9999
DE29FB3971E71543FD2DC049508EAEC5302DA568 \

generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ for version in "${versions[@]}"; do
8888

8989
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
9090

91-
suite="${variantParent#*:}" # "bullseye-slim", "bullseye"
92-
suite="${suite%-slim}" # "bullseye"
91+
suite="${variantParent#*:}" # "bookworm-slim", "bookworm"
92+
suite="${suite%-slim}" # "bookworm"
9393

9494
if [ "$variant" = 'alpine' ]; then
9595
suite="alpine$suite" # "alpine3.15"

0 commit comments

Comments
 (0)