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

diff --git a/apache/Dockerfile b/apache/Dockerfile
index f3d3d1b4c746ebf69ce7338d28078bc2be770eab..8cb91fcbc9a73d87878c3abd1dd99a0456862ba0 100644 (file)
--- 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 2bd1c08e1953b61bb583bf6cf045786ba935ef4f..86f180703c28edb9e2c1af0644138fd9b1882e8e 100644 (file)
--- 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 e3f1b767827c6280c9b4df2a987b3efaa87f6e85..d74d7c673398800cb3585801f18d00c10563d9d1 100644 (file)
--- 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 a5da1a8421ca22b0d42a1933377cbf853e436553..c14f2eb5a29590c60a1bfecc5e6ac8975a82dc2d 100644 (file)
--- 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 7c48d38673c4102375b0b40a7c6b3e3792643972..2f6632fdfbe8c9ece0ca7a5525fe0199853beb3f 100644 (file)
--- 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; \