(storm-docker) branch master updated: Adjust keyserver urls

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new 965de97  Adjust keyserver urls
965de97 is described below

commit 965de975c7af0ed35174b4276971c52965b0fa0b
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Wed Jan 17 09:11:39 2024 +0100

    Adjust keyserver urls
---
 2.6.0/Dockerfile                 | 5 +++--
 automation/create-key-section.sh | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/2.6.0/Dockerfile b/2.6.0/Dockerfile
index 637f03a..ae45f40 100644
--- a/2.6.0/Dockerfile
+++ b/2.6.0/Dockerfile
@@ -69,9 +69,10 @@ RUN set -eux; \
       # Richard Zowalla (Code Signing Key) <r...@apache.org>
       B83D15E72253ED1104EB4FBBDAB472F0E5B8A431 \
       ; do \
-        gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
"$key" || \
+        gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" 
|| \
         gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-        gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+        gpg --batch --keyserver hkps://pgp.mit.edu --recv-keys "$key" || \
+        gpg --batch --keyserver hkps://keyserver.pgp.com --recv-keys "$key" ; \
       done; \
     }; \
     ddist "$DISTRO_NAME.tar.gz" "storm/$DISTRO_NAME/$DISTRO_NAME.tar.gz"; \
diff --git a/automation/create-key-section.sh b/automation/create-key-section.sh
index 836c6e2..ce2514b 100755
--- a/automation/create-key-section.sh
+++ b/automation/create-key-section.sh
@@ -5,8 +5,9 @@ echo "  for key in \\"
 docker run --rm buildpack-deps:bullseye-curl bash -c 'curl -fsSL 
https://dist.apache.org/repos/dist/release/storm/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 "  " fpr " \\"; pub = 0 }'
 echo "  ; do \\"
-echo "    gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
\"\$key\" || \\"
+echo "    gpg --batch --keyserver hkps://keyserver.ubuntu.com--recv-keys 
\"\$key\" || \\"
 echo "    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys 
\"\$key\" || \\"
-echo "    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys \"\$key\" ; 
\\"
+echo "    gpg --batch --keyserver hkps://pgp.mit.edu --recv-keys \"\$key\" || 
\\"
+echo "    gpg --batch --keyserver hkps://keyserver.pgp.com  --recv-keys 
\"\$key\" ; \\"
 echo "  done; \\"
 echo "}; \\"