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
docker-library · Jun 22, 2021 · 6da0064 · 6da0064
1 parent c1ef5dd
commit 6da0064
Show file tree

Hide file tree

Showing 42 changed files with 42 additions and 42 deletions.
diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile
diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile
diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile
diff --git a/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile
diff --git a/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile
diff --git a/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile
diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile
diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile
diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile
diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile
diff --git a/7.3/stretch/apache/Dockerfile b/7.3/stretch/apache/Dockerfile
diff --git a/7.3/stretch/cli/Dockerfile b/7.3/stretch/cli/Dockerfile
diff --git a/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile
diff --git a/7.3/stretch/zts/Dockerfile b/7.3/stretch/zts/Dockerfile
diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile
diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile
diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile
diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile
diff --git a/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile
diff --git a/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile
diff --git a/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile
diff --git a/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile
diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile
diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile
diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile
diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile
diff --git a/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile
diff --git a/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile
diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile
diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile
diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile
diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile
diff --git a/8.1-rc/alpine3.13/cli/Dockerfile b/8.1-rc/alpine3.13/cli/Dockerfile
diff --git a/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile
diff --git a/8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile
diff --git a/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile
diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile
diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile
diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile
diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -80,7 +80,7 @@ RUN set -eux; \
 		curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \
 		export GNUPGHOME="$(mktemp -d)"; \
 		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 		done; \
 		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
 		gpgconf --kill all; \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -83,7 +83,7 @@ RUN set -eux; \
 		curl -fsSL -o php.tar.xz.asc "$PHP_ASC_URL"; \
 		export GNUPGHOME="$(mktemp -d)"; \
 		for key in $GPG_KEYS; do \
-			gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+			gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 		done; \
 		gpg --batch --verify php.tar.xz.asc php.tar.xz; \
 		gpgconf --kill all; \