From 6932ac255d29759af9a74c6931faeb02de0fe53e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 14 Nov 2018 12:39:44 -0800 Subject: [PATCH] Update "gpg" invocations to use "--batch" See https://bugs.debian.org/913614 --- 3.2/Dockerfile | 6 +++--- 3.4/Dockerfile | 6 +++--- 3.6/Dockerfile | 6 +++--- 4.0/Dockerfile | 6 +++--- 4.1/Dockerfile | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 160f972979..d592cfc63b 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ 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 && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -54,9 +54,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/mongodb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 5125540876..86ad4f4441 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ 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 && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -50,9 +50,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/mongodb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 3e03528f3d..07ea229131 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -29,7 +29,7 @@ RUN set -ex; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ 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; \ gpgconf --kill all; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -52,9 +52,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/mongodb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \ gpgconf --kill all; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 6139141589..2f3d2581ed 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ 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 && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -50,9 +50,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/mongodb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 6617e3a9dc..7399858d71 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex; \ wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ 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 && gpgconf --kill all || :; \ rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ @@ -50,9 +50,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/mongodb.gpg; \ + gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mongodb.gpg; \ command -v gpgconf && gpgconf --kill all || :; \ rm -r "$GNUPGHOME"; \ apt-key list