diff --git a/10.1/Dockerfile b/10.1/Dockerfile index 87b59a9..51d72bc 100644 --- a/10.1/Dockerfile +++ b/10.1/Dockerfile @@ -24,7 +24,13 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ + done && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc || true; \ \ @@ -60,7 +66,13 @@ ENV GPG_KEYS \ RUN set -ex; \ 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys "$key" && break || : ; \ + done ; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ rm -r "$GNUPGHOME" || true; \ diff --git a/10.2/Dockerfile b/10.2/Dockerfile index 3ea504f..ae72cdc 100644 --- a/10.2/Dockerfile +++ b/10.2/Dockerfile @@ -24,7 +24,14 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ + done && \ + gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc || true; \ \ @@ -59,9 +66,15 @@ ENV GPG_KEYS \ 4D1BB29D63D98E422B2113B19334A25F8507EFA5 RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ - done; \ + for key in $GPG_KEYS; do \ + 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys "$key" && break || : ; \ + done ; \ + done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ rm -r "$GNUPGHOME" || true; \ apt-key list diff --git a/10.3/Dockerfile b/10.3/Dockerfile index 2dd741e..5e5950f 100644 --- a/10.3/Dockerfile +++ b/10.3/Dockerfile @@ -24,7 +24,13 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ + done && \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc || true; \ \ @@ -59,9 +65,15 @@ ENV GPG_KEYS \ 4D1BB29D63D98E422B2113B19334A25F8507EFA5 RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ - for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ - done; \ + for key in $GPG_KEYS; do \ + 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 \ + pgp.mit.edu) ; do \ + gpg --keyserver "$server" --recv-keys "$key" && break || : ; \ + done ; \ + done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ rm -r "$GNUPGHOME" || true; \ apt-key list