Remove defunct pgp keyservers from Dockerfiles.

4 years ago · 8212bbe29b
parent 8459a3c456
commit 8212bbe29b
7 changed files with 7 additions and 14 deletions
--- a/docker/1.5-openssl/Dockerfile
+++ b/docker/1.5-openssl/Dockerfile
@ -40,9 +40,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        htps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/1.5/Dockerfile
+++ b/docker/1.5/Dockerfile
@ -42,9 +42,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/1.6-openssl/Dockerfile
+++ b/docker/1.6-openssl/Dockerfile
@ -45,9 +45,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/1.6/Dockerfile
+++ b/docker/1.6/Dockerfile
@ -45,9 +45,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/2.0-openssl/Dockerfile
+++ b/docker/2.0-openssl/Dockerfile
@ -46,9 +46,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/2.0/Dockerfile
+++ b/docker/2.0/Dockerfile
@ -46,9 +46,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \
--- a/docker/generic/Dockerfile
+++ b/docker/generic/Dockerfile
@ -63,9 +63,8 @@ RUN set -x && \
    export GNUPGHOME="$(mktemp -d)" && \
    found=''; \
    for server in \
-        ha.pool.sks-keyservers.net \
+        hkps://keys.openpgp.org \
        hkp://keyserver.ubuntu.com:80 \
-        hkp://p80.pool.sks-keyservers.net:80 \
        pgp.mit.edu \
    ; do \
        echo "Fetching GPG key $GPG_KEYS from $server"; \