From 12e6fdf738ee280abc4aa94238f5f3ca17b2e199 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Wed, 11 Aug 2021 18:49:58 +0200 Subject: [PATCH] GPG: Fix GPG keyservers sks-keyservers.net was shut down some time ago. keys.gnupg.net is just an alias. Neither pgp.mit.edu, nor keyserver.pgp.com are available right now, but there was no take-down notice, so we should assume they are temporarily unavailable. Use keys.openpgp.org as main alternative. Signed-off-by: Daniel Rudolf --- Dockerfile-alpine.template | 4 +--- Dockerfile-debian.template | 4 +--- apache/Dockerfile | 4 +--- fpm-alpine/Dockerfile | 4 +--- fpm/Dockerfile | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index fb9f8c1..87e7c96 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -91,9 +91,7 @@ RUN set -ex; \ curl -fsSL -o phpMyAdmin.tar.xz $URL; \ curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \ echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ + gpg --batch --keyserver keys.openpgp.org --recv-keys "$GPGKEY" \ || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 1f09795..3d2157c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -98,9 +98,7 @@ RUN set -ex; \ curl -fsSL -o phpMyAdmin.tar.xz $URL; \ curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \ echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ + gpg --batch --keyserver keys.openpgp.org --recv-keys "$GPGKEY" \ || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ diff --git a/apache/Dockerfile b/apache/Dockerfile index c809c57..5b3f70b 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -98,9 +98,7 @@ RUN set -ex; \ curl -fsSL -o phpMyAdmin.tar.xz $URL; \ curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \ echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ + gpg --batch --keyserver keys.openpgp.org --recv-keys "$GPGKEY" \ || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index 7436fe8..5d60a89 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -91,9 +91,7 @@ RUN set -ex; \ curl -fsSL -o phpMyAdmin.tar.xz $URL; \ curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \ echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ + gpg --batch --keyserver keys.openpgp.org --recv-keys "$GPGKEY" \ || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index fd0cdca..a90a5c2 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -98,9 +98,7 @@ RUN set -ex; \ curl -fsSL -o phpMyAdmin.tar.xz $URL; \ curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \ echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ + gpg --batch --keyserver keys.openpgp.org --recv-keys "$GPGKEY" \ || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \