From 1fa7dd881651bb5034daaf51a2e63de3d520e506 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 11 Nov 2018 20:55:48 +0100 Subject: [PATCH] Add --no-tty option when fetching GPG keys --- php-apache/Dockerfile | 2 +- php-fpm/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile index 3d361b1..6bfb3a2 100644 --- 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 51b1027..19f5a80 100644 --- 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; \