From 08b057215dd2c8fbacdc39cee5b3b58d0f87af63 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 14 Nov 2018 12:49:07 -0800 Subject: [PATCH] Update "gpg" invocations to use "--batch" See https://bugs.debian.org/913614 --- Dockerfile-cli.template | 2 +- php5.6/cli/Dockerfile | 2 +- php7.0/cli/Dockerfile | 2 +- php7.1/cli/Dockerfile | 2 +- php7.2/cli/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 0aba6fc3c9..69da5fd7c5 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -63,7 +63,7 @@ RUN set -ex; \ curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \ diff --git a/php5.6/cli/Dockerfile b/php5.6/cli/Dockerfile index 863d37899a..586cd1a27c 100644 --- a/php5.6/cli/Dockerfile +++ b/php5.6/cli/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \ diff --git a/php7.0/cli/Dockerfile b/php7.0/cli/Dockerfile index 2da9023a89..7767f19ba1 100644 --- a/php7.0/cli/Dockerfile +++ b/php7.0/cli/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \ diff --git a/php7.1/cli/Dockerfile b/php7.1/cli/Dockerfile index 6cc322d1dd..cad1fc8a87 100644 --- a/php7.1/cli/Dockerfile +++ b/php7.1/cli/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \ diff --git a/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile index bc1d625bfe..e91bfc1d00 100644 --- a/php7.2/cli/Dockerfile +++ b/php7.2/cli/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ curl -o /usr/local/bin/wp.gpg -fSL "https://github.com/wp-cli/wp-cli/releases/download/v${WORDPRESS_CLI_VERSION}/wp-cli-${WORDPRESS_CLI_VERSION}.phar.gpg"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \ gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \