From 808bd4e50b590de39b422cc37e21902b8197e3af Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 14 Nov 2018 12:38:45 -0800 Subject: [PATCH] Update "gpg" invocations to use "--batch" See https://bugs.debian.org/913614 --- 10.0/Dockerfile | 6 +++--- 10.1/Dockerfile | 6 +++--- 10.2/Dockerfile | 6 +++--- 10.3/Dockerfile | 6 +++--- 5.5/Dockerfile | 6 +++--- Dockerfile.template | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 9e3f5c7e..c215d939 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/10.1/Dockerfile b/10.1/Dockerfile index 98d80bc9..2cbad9a2 100644 --- a/10.1/Dockerfile +++ b/10.1/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/10.2/Dockerfile b/10.2/Dockerfile index a3d15ef2..18003b40 100644 --- a/10.2/Dockerfile +++ b/10.2/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/10.3/Dockerfile b/10.3/Dockerfile index 82449856..19ae06bd 100644 --- a/10.3/Dockerfile +++ b/10.3/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 6df3fb7f..48dc628f 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/Dockerfile.template b/Dockerfile.template index 07f6187c..ff290717 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -35,7 +35,7 @@ RUN set -ex; \ \ # verify the signature export GNUPGHOME="$(mktemp -d)"; \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -81,9 +81,9 @@ ENV GPG_KEYS \ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ for key in $GPG_KEYS; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ - gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list