From 5c0e796bb660f0ae42ae8bf084470f13417b8d63 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 Jun 2021 14:00:05 -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 --- 10/buster/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 11/buster/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 9.6/buster/Dockerfile | 2 +- 9.6/stretch/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 795143f4c5..965fdce2c9 100644 --- a/10/buster/Dockerfile +++ b/10/buster/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 2b7eb9ca11..d757fc951c 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/11/buster/Dockerfile b/11/buster/Dockerfile index 527456c266..5c8dd5ebef 100644 --- a/11/buster/Dockerfile +++ b/11/buster/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index a3f46109c1..da1b9e5f5b 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 6dafa8a094..bebaf22af0 100644 --- a/12/buster/Dockerfile +++ b/12/buster/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 6ce45fa7db..98e3048e6a 100644 --- a/13/buster/Dockerfile +++ b/13/buster/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/9.6/buster/Dockerfile b/9.6/buster/Dockerfile index 5c7a42fe61..e83eb2f0c3 100644 --- a/9.6/buster/Dockerfile +++ b/9.6/buster/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/9.6/stretch/Dockerfile b/9.6/stretch/Dockerfile index ddd03bbf6e..0cf93843c3 100644 --- a/9.6/stretch/Dockerfile +++ b/9.6/stretch/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 95eb829801..692fb67d54 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -75,7 +75,7 @@ RUN set -ex; \ # uid PostgreSQL Debian Repository key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \