From c0df3d5463944671fefe200bdadd95c69a616ab4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 14 Nov 2018 12:48:43 -0800 Subject: [PATCH] Update "gpg" invocations to use "--batch" See https://bugs.debian.org/913614 --- 7/jre7-alpine/Dockerfile | 2 +- 7/jre7-slim/Dockerfile | 2 +- 7/jre7/Dockerfile | 2 +- 7/jre8-alpine/Dockerfile | 2 +- 7/jre8-slim/Dockerfile | 2 +- 7/jre8/Dockerfile | 2 +- 8.5/jre10-slim/Dockerfile | 2 +- 8.5/jre10/Dockerfile | 2 +- 8.5/jre11-slim/Dockerfile | 2 +- 8.5/jre11/Dockerfile | 2 +- 8.5/jre8-alpine/Dockerfile | 2 +- 8.5/jre8-slim/Dockerfile | 2 +- 8.5/jre8/Dockerfile | 2 +- 9.0/jre10-slim/Dockerfile | 2 +- 9.0/jre10/Dockerfile | 2 +- 9.0/jre11-slim/Dockerfile | 2 +- 9.0/jre11/Dockerfile | 2 +- 9.0/jre8-alpine/Dockerfile | 2 +- 9.0/jre8-slim/Dockerfile | 2 +- 9.0/jre8/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile.template | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile index 50dee5bf2..e0aa0329c 100644 --- a/7/jre7-alpine/Dockerfile +++ b/7/jre7-alpine/Dockerfile @@ -43,7 +43,7 @@ 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; \ \ success=; \ diff --git a/7/jre7-slim/Dockerfile b/7/jre7-slim/Dockerfile index 856fdf1d8..ab1e91549 100644 --- a/7/jre7-slim/Dockerfile +++ b/7/jre7-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre7/Dockerfile b/7/jre7/Dockerfile index 45a41526b..08cafbbdb 100644 --- a/7/jre7/Dockerfile +++ b/7/jre7/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile index b94f65d8f..9f225b864 100644 --- a/7/jre8-alpine/Dockerfile +++ b/7/jre8-alpine/Dockerfile @@ -43,7 +43,7 @@ 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; \ \ success=; \ diff --git a/7/jre8-slim/Dockerfile b/7/jre8-slim/Dockerfile index 8a100b096..70ec885d3 100644 --- a/7/jre8-slim/Dockerfile +++ b/7/jre8-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/7/jre8/Dockerfile b/7/jre8/Dockerfile index 49597e2be..8a2c3c677 100644 --- a/7/jre8/Dockerfile +++ b/7/jre8/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre10-slim/Dockerfile b/8.5/jre10-slim/Dockerfile index 09c3463c2..2135acee0 100644 --- a/8.5/jre10-slim/Dockerfile +++ b/8.5/jre10-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre10/Dockerfile b/8.5/jre10/Dockerfile index f50d3da0b..5d5b77df1 100644 --- a/8.5/jre10/Dockerfile +++ b/8.5/jre10/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre11-slim/Dockerfile b/8.5/jre11-slim/Dockerfile index a6c877bf9..07bcf1a0e 100644 --- a/8.5/jre11-slim/Dockerfile +++ b/8.5/jre11-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre11/Dockerfile b/8.5/jre11/Dockerfile index d7a7b7cfc..beb4797c1 100644 --- a/8.5/jre11/Dockerfile +++ b/8.5/jre11/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile index 07ea7bb1a..25e5ca3c9 100644 --- a/8.5/jre8-alpine/Dockerfile +++ b/8.5/jre8-alpine/Dockerfile @@ -43,7 +43,7 @@ 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; \ \ success=; \ diff --git a/8.5/jre8-slim/Dockerfile b/8.5/jre8-slim/Dockerfile index 71fef1af4..3cc5b58b2 100644 --- a/8.5/jre8-slim/Dockerfile +++ b/8.5/jre8-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/8.5/jre8/Dockerfile b/8.5/jre8/Dockerfile index 8b264e671..ba805405c 100644 --- a/8.5/jre8/Dockerfile +++ b/8.5/jre8/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre10-slim/Dockerfile b/9.0/jre10-slim/Dockerfile index e002050e4..dbb3597c1 100644 --- a/9.0/jre10-slim/Dockerfile +++ b/9.0/jre10-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre10/Dockerfile b/9.0/jre10/Dockerfile index bc578005d..70c52852c 100644 --- a/9.0/jre10/Dockerfile +++ b/9.0/jre10/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre11-slim/Dockerfile b/9.0/jre11-slim/Dockerfile index 476470a9e..183ac033c 100644 --- a/9.0/jre11-slim/Dockerfile +++ b/9.0/jre11-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre11/Dockerfile b/9.0/jre11/Dockerfile index 685384989..424cbf0f4 100644 --- a/9.0/jre11/Dockerfile +++ b/9.0/jre11/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile index 08de58bbb..6e1f1af23 100644 --- a/9.0/jre8-alpine/Dockerfile +++ b/9.0/jre8-alpine/Dockerfile @@ -43,7 +43,7 @@ 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; \ \ success=; \ diff --git a/9.0/jre8-slim/Dockerfile b/9.0/jre8-slim/Dockerfile index 7c79545b2..7aa9a2582 100644 --- a/9.0/jre8-slim/Dockerfile +++ b/9.0/jre8-slim/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/9.0/jre8/Dockerfile b/9.0/jre8/Dockerfile index d19496325..844a5d067 100644 --- a/9.0/jre8/Dockerfile +++ b/9.0/jre8/Dockerfile @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d03f099b9..d391aada3 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -43,7 +43,7 @@ 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; \ \ success=; \ diff --git a/Dockerfile.template b/Dockerfile.template index 178bc425a..5de4729bd 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -79,7 +79,7 @@ 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; \ \ apt-get install -y --no-install-recommends wget ca-certificates; \