From f2ea11cba76617ab3556c1c622df450f4b476189 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Apr 2024 13:40:57 -0700 Subject: [PATCH] Update PGP keys for 11 (add remm@apache) --- 11.0/jdk21/temurin-jammy/Dockerfile | 2 +- 11.0/jre21/temurin-jammy/Dockerfile | 2 +- Dockerfile.template | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/11.0/jdk21/temurin-jammy/Dockerfile b/11.0/jdk21/temurin-jammy/Dockerfile index c0200fca..34f911d5 100644 --- a/11.0/jdk21/temurin-jammy/Dockerfile +++ b/11.0/jdk21/temurin-jammy/Dockerfile @@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR # see https://www.apache.org/dist/tomcat/tomcat-11/KEYS # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh) -ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 +ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 ENV TOMCAT_MAJOR 11 ENV TOMCAT_VERSION 11.0.0-M18 diff --git a/11.0/jre21/temurin-jammy/Dockerfile b/11.0/jre21/temurin-jammy/Dockerfile index 0a18c059..d612754f 100644 --- a/11.0/jre21/temurin-jammy/Dockerfile +++ b/11.0/jre21/temurin-jammy/Dockerfile @@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR # see https://www.apache.org/dist/tomcat/tomcat-11/KEYS # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh) -ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 +ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 ENV TOMCAT_MAJOR 11 ENV TOMCAT_VERSION 11.0.0-M18 diff --git a/Dockerfile.template b/Dockerfile.template index c288f7c9..bb6868ab 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -17,11 +17,13 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR # see https://www.apache.org/dist/tomcat/tomcat-{{ major }}/KEYS # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh) ENV GPG_KEYS {{ - # docker run --rm buildpack-deps:bullseye-curl bash -c 'wget -qO- https://www.apache.org/dist/tomcat/tomcat-10/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 "\t\t\t#", $10; print "\t\t\t\"" fpr "\","; pub = 0 } END { print "\t\t\t# trailing comma 👀\n\t\t\tempty" }' + # docker run --rm buildpack-deps:bookworm-curl bash -c 'wget -qO- https://www.apache.org/dist/tomcat/tomcat-10/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 "\t\t\t#", $10; print "\t\t\t\"" fpr "\","; pub = 0 } END { print "\t\t\t# trailing comma 👀\n\t\t\tempty" }' { "11": [ # Mark E D Thomas "A9C5DF4D22E99998D9875A5110C01C5A2F6059E7", + # Remy Maucherat + "48F8E69F6390C9F25CFEDCD268248959359E722B", # trailing comma 👀 empty ],