From 1627f13909910f37d4bcd1480d6e7f584bf1b6b1 Mon Sep 17 00:00:00 2001 From: andelm Date: Tue, 6 Feb 2018 09:32:41 +0100 Subject: [PATCH] loop over keyservers (issue #87) --- 7/jre7-alpine/Dockerfile | 9 ++++++++- 7/jre7-slim/Dockerfile | 9 ++++++++- 7/jre7/Dockerfile | 9 ++++++++- 7/jre8-alpine/Dockerfile | 9 ++++++++- 7/jre8-slim/Dockerfile | 9 ++++++++- 7/jre8/Dockerfile | 9 ++++++++- 8.0/jre7-alpine/Dockerfile | 9 ++++++++- 8.0/jre7-slim/Dockerfile | 9 ++++++++- 8.0/jre7/Dockerfile | 9 ++++++++- 8.0/jre8-alpine/Dockerfile | 9 ++++++++- 8.0/jre8-slim/Dockerfile | 9 ++++++++- 8.0/jre8/Dockerfile | 9 ++++++++- 8.5/jre8-alpine/Dockerfile | 9 ++++++++- 8.5/jre8-slim/Dockerfile | 9 ++++++++- 8.5/jre8/Dockerfile | 9 ++++++++- 8.5/jre9-slim/Dockerfile | 9 ++++++++- 8.5/jre9/Dockerfile | 9 ++++++++- 9.0/jre8-alpine/Dockerfile | 9 ++++++++- 9.0/jre8-slim/Dockerfile | 9 ++++++++- 9.0/jre8/Dockerfile | 9 ++++++++- 9.0/jre9-slim/Dockerfile | 9 ++++++++- 9.0/jre9/Dockerfile | 9 ++++++++- Dockerfile-alpine.template | 9 ++++++++- Dockerfile.template | 9 ++++++++- 24 files changed, 192 insertions(+), 24 deletions(-) diff --git a/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile index 046395fe5..a2c689bbb 100644 --- a/7/jre7-alpine/Dockerfile +++ b/7/jre7-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/7/jre7-slim/Dockerfile b/7/jre7-slim/Dockerfile index 6ac80da2d..aff8ab375 100644 --- a/7/jre7-slim/Dockerfile +++ b/7/jre7-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre7/Dockerfile b/7/jre7/Dockerfile index e6087602c..36a9c6d36 100644 --- a/7/jre7/Dockerfile +++ b/7/jre7/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile index b9ebc864c..91d83ae54 100644 --- a/7/jre8-alpine/Dockerfile +++ b/7/jre8-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/7/jre8-slim/Dockerfile b/7/jre8-slim/Dockerfile index 59623aba4..310409f84 100644 --- a/7/jre8-slim/Dockerfile +++ b/7/jre8-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre8/Dockerfile b/7/jre8/Dockerfile index c911cbb82..aa63c9e33 100644 --- a/7/jre8/Dockerfile +++ b/7/jre8/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile index 57929d64c..56cbec8dd 100644 --- a/8.0/jre7-alpine/Dockerfile +++ b/8.0/jre7-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/8.0/jre7-slim/Dockerfile b/8.0/jre7-slim/Dockerfile index 8a8e0aefb..a8711874f 100644 --- a/8.0/jre7-slim/Dockerfile +++ b/8.0/jre7-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.0/jre7/Dockerfile b/8.0/jre7/Dockerfile index 6e522e322..77e26585b 100644 --- a/8.0/jre7/Dockerfile +++ b/8.0/jre7/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile index 37166d623..00971ca79 100644 --- a/8.0/jre8-alpine/Dockerfile +++ b/8.0/jre8-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/8.0/jre8-slim/Dockerfile b/8.0/jre8-slim/Dockerfile index e0e8442e6..cd9cd695c 100644 --- a/8.0/jre8-slim/Dockerfile +++ b/8.0/jre8-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.0/jre8/Dockerfile b/8.0/jre8/Dockerfile index 1ab163057..2ff00126a 100644 --- a/8.0/jre8/Dockerfile +++ b/8.0/jre8/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile index 1ba62e609..6d61458da 100644 --- a/8.5/jre8-alpine/Dockerfile +++ b/8.5/jre8-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/8.5/jre8-slim/Dockerfile b/8.5/jre8-slim/Dockerfile index 0012530bc..a63b59813 100644 --- a/8.5/jre8-slim/Dockerfile +++ b/8.5/jre8-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre8/Dockerfile b/8.5/jre8/Dockerfile index a8f1f8ce3..ae5337ae0 100644 --- a/8.5/jre8/Dockerfile +++ b/8.5/jre8/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre9-slim/Dockerfile b/8.5/jre9-slim/Dockerfile index 42af17f8d..5f722151e 100644 --- a/8.5/jre9-slim/Dockerfile +++ b/8.5/jre9-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre9/Dockerfile b/8.5/jre9/Dockerfile index a71bec9cd..70ac99cde 100644 --- a/8.5/jre9/Dockerfile +++ b/8.5/jre9/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile index 1b01d3bdc..125c41eb3 100644 --- a/9.0/jre8-alpine/Dockerfile +++ b/9.0/jre8-alpine/Dockerfile @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/9.0/jre8-slim/Dockerfile b/9.0/jre8-slim/Dockerfile index 779407e2c..cb1d2100b 100644 --- a/9.0/jre8-slim/Dockerfile +++ b/9.0/jre8-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre8/Dockerfile b/9.0/jre8/Dockerfile index 2f9c49022..c7c369d76 100644 --- a/9.0/jre8/Dockerfile +++ b/9.0/jre8/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre9-slim/Dockerfile b/9.0/jre9-slim/Dockerfile index 25c763cbf..65f0e4618 100644 --- a/9.0/jre9-slim/Dockerfile +++ b/9.0/jre9-slim/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre9/Dockerfile b/9.0/jre9/Dockerfile index b0db2461a..f52d08cf4 100644 --- a/9.0/jre9/Dockerfile +++ b/9.0/jre9/Dockerfile @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 751dfb1e9..df4499e70 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -43,7 +43,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ success=; \ diff --git a/Dockerfile.template b/Dockerfile.template index 43b409df5..d2642e22d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -79,7 +79,14 @@ RUN set -eux; \ \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + for server in $(shuf -e ha.pool.sks-keyservers.net \ + hkp://p80.pool.sks-keyservers.net:80 \ + keyserver.ubuntu.com \ + hkp://keyserver.ubuntu.com:80 \ + keyserver.pgp.com \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys $key && break || : ; \ + done; \ done; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \