Add --no-tty option when fetching GPG keys

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 3d361b1ccff36a8c8fd69eb8ac2846e8862281e7..6bfb3a226350fcf907e8e70d73f8e7722829b977 100644 (file)
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -67,7 +67,7 @@ RUN set -ex; \
        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)"; \
        # 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 --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --no-tty --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 51b1027bed0cf13743986c59a159146d69827383..19f5a804964ef61abe1c7fd72a8a645f45d433c0 100644 (file)
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -64,7 +64,7 @@ RUN set -ex; \
        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)"; \
        # 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 --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys F3E4C04BB3DB5D4215C45F7F5AB2BAA141C4F7D5 || gpg --no-tty --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; \