From 6da00646d52e29c26491ee25d1ab2e3dcb4cc940 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 Jun 2021 13:59:01 -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 --- 7.3/alpine3.13/cli/Dockerfile | 2 +- 7.3/alpine3.13/fpm/Dockerfile | 2 +- 7.3/alpine3.13/zts/Dockerfile | 2 +- 7.3/alpine3.14/cli/Dockerfile | 2 +- 7.3/alpine3.14/fpm/Dockerfile | 2 +- 7.3/alpine3.14/zts/Dockerfile | 2 +- 7.3/buster/apache/Dockerfile | 2 +- 7.3/buster/cli/Dockerfile | 2 +- 7.3/buster/fpm/Dockerfile | 2 +- 7.3/buster/zts/Dockerfile | 2 +- 7.3/stretch/apache/Dockerfile | 2 +- 7.3/stretch/cli/Dockerfile | 2 +- 7.3/stretch/fpm/Dockerfile | 2 +- 7.3/stretch/zts/Dockerfile | 2 +- 7.4/alpine3.13/cli/Dockerfile | 2 +- 7.4/alpine3.13/fpm/Dockerfile | 2 +- 7.4/alpine3.13/zts/Dockerfile | 2 +- 7.4/alpine3.14/cli/Dockerfile | 2 +- 7.4/alpine3.14/fpm/Dockerfile | 2 +- 7.4/alpine3.14/zts/Dockerfile | 2 +- 7.4/buster/apache/Dockerfile | 2 +- 7.4/buster/cli/Dockerfile | 2 +- 7.4/buster/fpm/Dockerfile | 2 +- 7.4/buster/zts/Dockerfile | 2 +- 8.0/alpine3.13/cli/Dockerfile | 2 +- 8.0/alpine3.13/fpm/Dockerfile | 2 +- 8.0/alpine3.14/cli/Dockerfile | 2 +- 8.0/alpine3.14/fpm/Dockerfile | 2 +- 8.0/buster/apache/Dockerfile | 2 +- 8.0/buster/cli/Dockerfile | 2 +- 8.0/buster/fpm/Dockerfile | 2 +- 8.0/buster/zts/Dockerfile | 2 +- 8.1-rc/alpine3.13/cli/Dockerfile | 2 +- 8.1-rc/alpine3.13/fpm/Dockerfile | 2 +- 8.1-rc/alpine3.14/cli/Dockerfile | 2 +- 8.1-rc/alpine3.14/fpm/Dockerfile | 2 +- 8.1-rc/buster/apache/Dockerfile | 2 +- 8.1-rc/buster/cli/Dockerfile | 2 +- 8.1-rc/buster/fpm/Dockerfile | 2 +- 8.1-rc/buster/zts/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile index ea7677a7..7f2ad99b 100644 --- a/7.3/alpine3.13/cli/Dockerfile +++ b/7.3/alpine3.13/cli/Dockerfile @@ -79,7 +79,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/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile index 9c423fb9..f4154d20 100644 --- a/7.3/alpine3.13/fpm/Dockerfile +++ b/7.3/alpine3.13/fpm/Dockerfile @@ -81,7 +81,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/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile index 68168054..4296708d 100644 --- a/7.3/alpine3.13/zts/Dockerfile +++ b/7.3/alpine3.13/zts/Dockerfile @@ -81,7 +81,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/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile index b5c67ede..73da3912 100644 --- a/7.3/alpine3.14/cli/Dockerfile +++ b/7.3/alpine3.14/cli/Dockerfile @@ -78,7 +78,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/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile index 58847a03..5861a9a5 100644 --- a/7.3/alpine3.14/fpm/Dockerfile +++ b/7.3/alpine3.14/fpm/Dockerfile @@ -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/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile index 0d99ac40..62641b4b 100644 --- a/7.3/alpine3.14/zts/Dockerfile +++ b/7.3/alpine3.14/zts/Dockerfile @@ -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/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile index eb42a719..3e366d11 100644 --- a/7.3/buster/apache/Dockerfile +++ b/7.3/buster/apache/Dockerfile @@ -145,7 +145,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/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile index bf6d8817..29a2db47 100644 --- a/7.3/buster/cli/Dockerfile +++ b/7.3/buster/cli/Dockerfile @@ -87,7 +87,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/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile index a9b1424c..cf4abb2a 100644 --- a/7.3/buster/fpm/Dockerfile +++ b/7.3/buster/fpm/Dockerfile @@ -86,7 +86,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/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index a5bd172a..07b975d2 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -86,7 +86,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/7.3/stretch/apache/Dockerfile b/7.3/stretch/apache/Dockerfile index 317325ff..610a5466 100644 --- a/7.3/stretch/apache/Dockerfile +++ b/7.3/stretch/apache/Dockerfile @@ -145,7 +145,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/7.3/stretch/cli/Dockerfile b/7.3/stretch/cli/Dockerfile index 28c3015e..90057aca 100644 --- a/7.3/stretch/cli/Dockerfile +++ b/7.3/stretch/cli/Dockerfile @@ -87,7 +87,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/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile index fc2569b1..2d5d72b7 100644 --- a/7.3/stretch/fpm/Dockerfile +++ b/7.3/stretch/fpm/Dockerfile @@ -86,7 +86,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/7.3/stretch/zts/Dockerfile b/7.3/stretch/zts/Dockerfile index 84449a7c..5afd8b4d 100644 --- a/7.3/stretch/zts/Dockerfile +++ b/7.3/stretch/zts/Dockerfile @@ -86,7 +86,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/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile index 648c25c4..84ea81b7 100644 --- a/7.4/alpine3.13/cli/Dockerfile +++ b/7.4/alpine3.13/cli/Dockerfile @@ -79,7 +79,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/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile index c0f9cce2..018a4b01 100644 --- a/7.4/alpine3.13/fpm/Dockerfile +++ b/7.4/alpine3.13/fpm/Dockerfile @@ -81,7 +81,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/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile index 2d5e4aab..eda75a2a 100644 --- a/7.4/alpine3.13/zts/Dockerfile +++ b/7.4/alpine3.13/zts/Dockerfile @@ -81,7 +81,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/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile index 5bd6dbdd..d6498f19 100644 --- a/7.4/alpine3.14/cli/Dockerfile +++ b/7.4/alpine3.14/cli/Dockerfile @@ -78,7 +78,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/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile index fa658d5b..4d687336 100644 --- a/7.4/alpine3.14/fpm/Dockerfile +++ b/7.4/alpine3.14/fpm/Dockerfile @@ -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/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile index 48177372..aadf499b 100644 --- a/7.4/alpine3.14/zts/Dockerfile +++ b/7.4/alpine3.14/zts/Dockerfile @@ -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/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile index d1c972e6..99a2df1d 100644 --- a/7.4/buster/apache/Dockerfile +++ b/7.4/buster/apache/Dockerfile @@ -145,7 +145,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/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile index 9d54c6d5..785aa279 100644 --- a/7.4/buster/cli/Dockerfile +++ b/7.4/buster/cli/Dockerfile @@ -87,7 +87,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/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile index 6463a1c0..bb78ddae 100644 --- a/7.4/buster/fpm/Dockerfile +++ b/7.4/buster/fpm/Dockerfile @@ -86,7 +86,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/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index fd57ec0d..9b75c4ce 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -86,7 +86,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/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile index cb6ea3a3..87e6c659 100644 --- a/8.0/alpine3.13/cli/Dockerfile +++ b/8.0/alpine3.13/cli/Dockerfile @@ -79,7 +79,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/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile index de4c0b0f..74b09bda 100644 --- a/8.0/alpine3.13/fpm/Dockerfile +++ b/8.0/alpine3.13/fpm/Dockerfile @@ -81,7 +81,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/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile index 330d6c77..d2941228 100644 --- a/8.0/alpine3.14/cli/Dockerfile +++ b/8.0/alpine3.14/cli/Dockerfile @@ -78,7 +78,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/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile index 69f6aeae..5d216e71 100644 --- a/8.0/alpine3.14/fpm/Dockerfile +++ b/8.0/alpine3.14/fpm/Dockerfile @@ -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/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 52520b91..587f9838 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -145,7 +145,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/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index 2d891144..02532e11 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -87,7 +87,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/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 6f66afc6..e6530edd 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -86,7 +86,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/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index e3051e59..6e37eeec 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -86,7 +86,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/8.1-rc/alpine3.13/cli/Dockerfile b/8.1-rc/alpine3.13/cli/Dockerfile index 4e1a248d..9e8c04f5 100644 --- a/8.1-rc/alpine3.13/cli/Dockerfile +++ b/8.1-rc/alpine3.13/cli/Dockerfile @@ -79,7 +79,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/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile index 185621d7..94075ec0 100644 --- a/8.1-rc/alpine3.13/fpm/Dockerfile +++ b/8.1-rc/alpine3.13/fpm/Dockerfile @@ -81,7 +81,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/8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile index 24494ff9..bc56f7e6 100644 --- a/8.1-rc/alpine3.14/cli/Dockerfile +++ b/8.1-rc/alpine3.14/cli/Dockerfile @@ -78,7 +78,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/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile index a9d45544..c7d129c1 100644 --- a/8.1-rc/alpine3.14/fpm/Dockerfile +++ b/8.1-rc/alpine3.14/fpm/Dockerfile @@ -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/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile index 4a1cb5d3..18c1f3ac 100644 --- a/8.1-rc/buster/apache/Dockerfile +++ b/8.1-rc/buster/apache/Dockerfile @@ -145,7 +145,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/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile index 5318d739..efd3e0e6 100644 --- a/8.1-rc/buster/cli/Dockerfile +++ b/8.1-rc/buster/cli/Dockerfile @@ -87,7 +87,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/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile index e3f52758..2f500709 100644 --- a/8.1-rc/buster/fpm/Dockerfile +++ b/8.1-rc/buster/fpm/Dockerfile @@ -86,7 +86,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/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 9db09e4d..76179191 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -86,7 +86,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-alpine.template b/Dockerfile-alpine.template index e0560b0f..ab9be80f 100644 --- 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 index a4e36ddd..7a362ded 100644 --- 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; \