From 9cdf93b8d604ca388b47c9ce8a0768abf8b1d73a Mon Sep 17 00:00:00 2001 From: Aaron Spettl Date: Sat, 21 Jul 2018 15:38:04 +0200 Subject: [PATCH] Use pgp.mit.edu as fallback keyserver if necessary --- php-apache/Dockerfile | 3 ++- php-fpm/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile index 0bc8cd5..443aa01 100644 --- 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 c25be08..ada1cb9 100644 --- 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; \