From ae83e3bd9a2151845af8a045ab07f7dee391cb94 Mon Sep 17 00:00:00 2001
From: michaelsteven <michaelsteven@hepfer.org>
Date: Wed, 17 Jan 2018 15:46:59 +0000
Subject: [PATCH] Use multiple keyserver sources

---
 2.1/Dockerfile      | 16 ++++++++++++++--
 2.2/Dockerfile      | 16 ++++++++++++++--
 3.0/Dockerfile      | 16 ++++++++++++++--
 3.11/Dockerfile     | 16 ++++++++++++++--
 Dockerfile.template | 16 ++++++++++++++--
 5 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/2.1/Dockerfile b/2.1/Dockerfile
index 7b87a4d..aebb1e2 100644
--- a/2.1/Dockerfile
+++ b/2.1/Dockerfile
@@ -11,7 +11,13 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
 	&& 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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -37,7 +43,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/cassandra.gpg; \
 	rm -r "$GNUPGHOME"; \
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
index c538f57..0da2665 100644
--- a/2.2/Dockerfile
+++ b/2.2/Dockerfile
@@ -11,7 +11,13 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
 	&& 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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -37,7 +43,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/cassandra.gpg; \
 	rm -r "$GNUPGHOME"; \
diff --git a/3.0/Dockerfile b/3.0/Dockerfile
index 0a6c7fa..212f7ef 100644
--- a/3.0/Dockerfile
+++ b/3.0/Dockerfile
@@ -11,7 +11,13 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
 	&& 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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -37,7 +43,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/cassandra.gpg; \
 	rm -r "$GNUPGHOME"; \
diff --git a/3.11/Dockerfile b/3.11/Dockerfile
index 7ed873e..f4e8343 100644
--- a/3.11/Dockerfile
+++ b/3.11/Dockerfile
@@ -11,7 +11,13 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
 	&& 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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -37,7 +43,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/cassandra.gpg; \
 	rm -r "$GNUPGHOME"; \
diff --git a/Dockerfile.template b/Dockerfile.template
index 8e88506..9be5538 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -11,7 +11,13 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
 	&& 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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -37,7 +43,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/cassandra.gpg; \
 	rm -r "$GNUPGHOME"; \