From: Thomas Bruederli <redacted>
Date: Sun, 27 Jun 2021 20:04:55 +0000 (+0200)
Subject: Remove sks-keyservers.net; download pubkey from roundcube.net directly
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=cc3a6dbf6e5a389ddb4c59f1ac920a747b250549;p=roundcube-roundcubemail-docker.git

Remove sks-keyservers.net; download pubkey from roundcube.net directly
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index f3d3d1b..8cb91fc 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -84,8 +84,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	# workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9
 	echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \
-	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
-	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+	curl -fSL https://roundcube.net/download/pubkey.asc | gpg --batch --import -; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	gpgconf --kill all; \
 	mkdir /usr/src/roundcubemail; \
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 2bd1c08..86f1807 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -76,8 +76,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	# workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9
 	echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \
-	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
-	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+	curl -fSL https://roundcube.net/download/pubkey.asc | gpg --batch --import -; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	gpgconf --kill all; \
 	mkdir /usr/src/roundcubemail; \
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index e3f1b76..d74d7c6 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -83,8 +83,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	# workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9
 	echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \
-	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
-	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+	curl -fSL https://roundcube.net/download/pubkey.asc | gpg --batch --import -; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	gpgconf --kill all; \
 	mkdir /usr/src/roundcubemail; \
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index a5da1a8..c14f2eb 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -76,8 +76,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	# workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9
 	echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \
-	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
-	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+	curl -fSL https://roundcube.net/download/pubkey.asc | gpg --batch --import -; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	gpgconf --kill all; \
 	mkdir /usr/src/roundcubemail; \
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 7c48d38..2f6632f 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -83,8 +83,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	# workaround for "Cannot assign requested address", see e.g. https://github.com/inversepath/usbarmory-debian-base_image/issues/9
 	echo "disable-ipv6" > "$GNUPGHOME/dirmngr.conf"; \
-	# ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
-	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --batch --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+	curl -fSL https://roundcube.net/download/pubkey.asc | gpg --batch --import -; \
 	gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
 	gpgconf --kill all; \
 	mkdir /usr/src/roundcubemail; \