Update "gpg" invocations to use "--batch"

See https://bugs.debian.org/913614
tianon · Nov 14, 2018 · 7bb7b72 · 7bb7b72
1 parent 774cdc2
commit 7bb7b72
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/apt-cacher-ng/Dockerfile b/apt-cacher-ng/Dockerfile
@@ -14,7 +14,7 @@ RUN set -x \
 	&& wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-amd64.asc" \
 	\
 	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
+	&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
 	&& gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \
 	&& rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \
 	\

diff --git a/exim4/Dockerfile b/exim4/Dockerfile
@@ -13,7 +13,7 @@ RUN set -eux; \
 	wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$dpkgArch"; \
 	wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini-$dpkgArch.asc"; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5; \
 	gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/tini.asc; \
 	chmod +x /usr/local/bin/tini; \

diff --git a/google-musicmanager/Dockerfile b/google-musicmanager/Dockerfile
@@ -27,11 +27,11 @@ RUN set -eux; \
 	\
 	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; \
 # only stretch+ supports --armor in trusted.gpg.asc
-#	gpg --export --armor $GPG_KEYS | tee /etc/apt/trusted.gpg.d/google.gpg.asc; \
-	gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/google.gpg; \
+#	gpg --batch --export --armor $GPG_KEYS | tee /etc/apt/trusted.gpg.d/google.gpg.asc; \
+	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/google.gpg; \
 	rm -rf "$GNUPGHOME"; \
 	\
 	apt-mark auto '.*' > /dev/null; \

diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
@@ -14,7 +14,7 @@ RUN set -x \
 	&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
 	&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).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 \
 	&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -26,7 +26,7 @@ RUN set -x \
 	&& wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini" \
 	&& wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini.asc" \
 	&& export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
+	&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \
 	&& gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \
 	&& rm -r "$GNUPGHOME" /usr/local/bin/tini.asc \
 	&& chmod +x /usr/local/bin/tini \
@@ -36,8 +36,8 @@ RUN apt-get update && apt-get install -y apt-transport-https && rm -rf /var/lib/
 
 ENV JENKINS_GPG_KEY 150FDE3F7787E7D11EF4E12A9B7D32F2D50582E6
 RUN export GNUPGHOME="$(mktemp -d)" \
-	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$JENKINS_GPG_KEY" \
-	&& gpg --export --armor "$JENKINS_GPG_KEY" > /etc/apt/trusted.gpg.d/jenkins.gpg.asc \
+	&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$JENKINS_GPG_KEY" \
+	&& gpg --batch --export --armor "$JENKINS_GPG_KEY" > /etc/apt/trusted.gpg.d/jenkins.gpg.asc \
 	&& rm -r "$GNUPGHOME" \
 	&& apt-key list
 RUN echo 'deb https://pkg.jenkins.io/debian binary/' > /etc/apt/sources.list.d/jenkins.list

diff --git a/makemkv/Dockerfile b/makemkv/Dockerfile
@@ -43,7 +43,7 @@ RUN set -ex; \
 #       2ECF 2330 5F1F C0B3 2001  6733 94E3 083A 1804 2697
 # uid           [ unknown] MakeMKV (signature) <support@makemkv.com>
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 2ECF23305F1FC0B32001673394E3083A18042697; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 2ECF23305F1FC0B32001673394E3083A18042697; \
 	gpg --batch --decrypt --output sha256sums.txt sha256sums.txt.sig; \
 	rm -rf "$GNUPGHOME" sha256sums.txt.sig; \
 	\

diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile
@@ -19,7 +19,7 @@ ENV GPG_KEYS \
 
 RUN set -ex; \
 	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
 
 ENV PHPMYADMIN_VERSION 4.8.3

diff --git a/skype/Dockerfile b/skype/Dockerfile
@@ -29,9 +29,9 @@ RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	for key in $SKYPE_REPO_GPG; 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/skype.gpg; \
+	gpg --batch --export $GPG_KEYS > /etc/apt/trusted.gpg.d/skype.gpg; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list; \
 	apt-mark auto '.*' > /dev/null; \

diff --git a/slack/Dockerfile b/slack/Dockerfile
@@ -28,8 +28,8 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists; \
 	\
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$SLACK_GPG_KEY"; \
-	gpg --export --armor "$SLACK_GPG_KEY" > /etc/apt/trusted.gpg.d/slack.gpg.asc; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SLACK_GPG_KEY"; \
+	gpg --batch --export --armor "$SLACK_GPG_KEY" > /etc/apt/trusted.gpg.d/slack.gpg.asc; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list; \
 	\