From a2d1a192e467f18b630166ea5efd99b1dc8ca1fb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 Jun 2021 13:54:16 -0700 Subject: [PATCH] Switch from SKS to Ubuntu keyserver See also https://github.com/docker-library/faq#openpgp--gnupg-keys-and-verification and https://github.com/tianon/pgp-happy-eyeballs --- 3.0/Dockerfile | 2 +- 3.1/Dockerfile | 2 +- 3.2/Dockerfile | 2 +- 4.0/Dockerfile | 2 +- 4.1/Dockerfile | 2 +- 4.2/Dockerfile | 2 +- 4.3/Dockerfile | 2 +- 4.4/Dockerfile | 2 +- 5.0/Dockerfile | 2 +- 5.1/Dockerfile | 2 +- Dockerfile.template | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3.0/Dockerfile b/3.0/Dockerfile index edb6f0b..c57d600 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/3.1/Dockerfile b/3.1/Dockerfile index d553181..c26e76d 100644 --- a/3.1/Dockerfile +++ b/3.1/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 6c35c34..d51c7b2 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 8c96fd9..d359c89 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 652d389..bcd95fd 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index c2075c2..318ff95 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/4.3/Dockerfile b/4.3/Dockerfile index a686722..4e25e4e 100644 --- a/4.3/Dockerfile +++ b/4.3/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 2bcc486..37334d9 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/5.0/Dockerfile b/5.0/Dockerfile index f607bcc..3ecc1f0 100644 --- a/5.0/Dockerfile +++ b/5.0/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/5.1/Dockerfile b/5.1/Dockerfile index 8caed98..9102fdd 100644 --- a/5.1/Dockerfile +++ b/5.1/Dockerfile @@ -46,7 +46,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ diff --git a/Dockerfile.template b/Dockerfile.template index 0610b06..1632de7 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -54,7 +54,7 @@ RUN set -eux; \ apk add --no-cache --virtual .gpg-deps gnupg; \ export GNUPGHOME="$(mktemp -d)"; \ # gpg: key 64EA74AB: public key "Chet Ramey " imported - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 7C0135FB088AAF6C66C650B9BB5869F064EA74AB; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \