Use pgp.mit.edu as fallback keyserver if necessary

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 0bc8cd55ba258421a17d644dc5259219a8e51d2b..443aa01894d7efcfeca371e4118cc4674d3daf26 100644 (file)
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -63,7 +63,8 @@ RUN set -ex; \
        curl -o roundcubemail.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \
        curl -o roundcubemail.tar.gz.asc -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc; \
        export GNUPGHOME="$(mktemp -d)"; \
-       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+       # ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
+       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
        gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
        tar -xzf roundcubemail.tar.gz -C /usr/src/; \
        gpgconf --kill all; \

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index c25be08fe8e1d9a35bc466aa67c99048d3181560..ada1cb951437de199c05381f352e05e9dde885e4 100644 (file)
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -60,7 +60,8 @@ RUN set -ex; \
        curl -o roundcubemail.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \
        curl -o roundcubemail.tar.gz.asc -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz.asc; \
        export GNUPGHOME="$(mktemp -d)"; \
-       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
+       # ha.pool.sks-keyservers.net seems to be unreliable, use pgp.mit.edu as fallback
+       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --keyserver pgp.mit.edu --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5; \
        gpg --batch --verify roundcubemail.tar.gz.asc roundcubemail.tar.gz; \
        tar -xzf roundcubemail.tar.gz -C /usr/src/; \
        gpgconf --kill all; \