From babe058abf92da5091d976173639663f7fea0d59 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 14 Nov 2018 12:37:43 -0800
Subject: [PATCH] Update "gpg" invocations to use "--batch"

See https://bugs.debian.org/913614
---
 5/Dockerfile               | 6 +++---
 5/alpine/Dockerfile        | 2 +-
 Dockerfile-alpine.template | 2 +-
 Dockerfile-debian.template | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/5/Dockerfile b/5/Dockerfile
index 21b0fa385..ccde4a1b2 100644
--- a/5/Dockerfile
+++ b/5/Dockerfile
@@ -16,7 +16,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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -26,8 +26,8 @@ RUN set -ex; \
 # https://artifacts.elastic.co/GPG-KEY-elasticsearch
 	key='46095ACC8548582C1A2699A9D27D666CD88E42B4'; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	gpg --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list
 
diff --git a/5/alpine/Dockerfile b/5/alpine/Dockerfile
index a5565fb9a..4057826c4 100644
--- a/5/alpine/Dockerfile
+++ b/5/alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	if [ "$LOGSTASH_TARBALL_ASC" ]; then \
 		wget -O logstash.tar.gz.asc "$LOGSTASH_TARBALL_ASC"; \
 		export GNUPGHOME="$(mktemp -d)"; \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
+		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
 		gpg --batch --verify logstash.tar.gz.asc logstash.tar.gz; \
 		rm -rf "$GNUPGHOME" logstash.tar.gz.asc; \
 	fi; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index be506b364..1a207f001 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -48,7 +48,7 @@ RUN set -ex; \
 	if [ "$LOGSTASH_TARBALL_ASC" ]; then \
 		wget -O logstash.tar.gz.asc "$LOGSTASH_TARBALL_ASC"; \
 		export GNUPGHOME="$(mktemp -d)"; \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
+		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY"; \
 		gpg --batch --verify logstash.tar.gz.asc logstash.tar.gz; \
 		rm -rf "$GNUPGHOME" logstash.tar.gz.asc; \
 	fi; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 6655537bc..81e8b035c 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -16,7 +16,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 -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
@@ -26,8 +26,8 @@ RUN set -ex; \
 # https://artifacts.elastic.co/GPG-KEY-elasticsearch
 	key='46095ACC8548582C1A2699A9D27D666CD88E42B4'; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	gpg --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/elastic.gpg; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list