From fe813dd8506e8b5d736800e391feb4217400d15e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 9 Sep 2020 13:57:45 -0700 Subject: [PATCH] Add "gpgconf --kill all" to GnuPG invocations --- 1.14/alpine3.11/Dockerfile | 1 + 1.14/alpine3.12/Dockerfile | 1 + 1.14/buster/Dockerfile | 1 + 1.14/stretch/Dockerfile | 1 + 1.15/alpine3.12/Dockerfile | 1 + 1.15/buster/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 8 files changed, 8 insertions(+) diff --git a/1.14/alpine3.11/Dockerfile b/1.14/alpine3.11/Dockerfile index b094ec93..59079a68 100644 --- a/1.14/alpine3.11/Dockerfile +++ b/1.14/alpine3.11/Dockerfile @@ -59,6 +59,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/1.14/alpine3.12/Dockerfile b/1.14/alpine3.12/Dockerfile index e4102008..f9493219 100644 --- a/1.14/alpine3.12/Dockerfile +++ b/1.14/alpine3.12/Dockerfile @@ -59,6 +59,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/1.14/buster/Dockerfile b/1.14/buster/Dockerfile index 597fce0f..391f7d70 100644 --- a/1.14/buster/Dockerfile +++ b/1.14/buster/Dockerfile @@ -73,6 +73,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/1.14/stretch/Dockerfile b/1.14/stretch/Dockerfile index 5fc2f6fe..80d031bb 100644 --- a/1.14/stretch/Dockerfile +++ b/1.14/stretch/Dockerfile @@ -73,6 +73,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/1.15/alpine3.12/Dockerfile b/1.15/alpine3.12/Dockerfile index d44449a0..90f17ef8 100644 --- a/1.15/alpine3.12/Dockerfile +++ b/1.15/alpine3.12/Dockerfile @@ -59,6 +59,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/1.15/buster/Dockerfile b/1.15/buster/Dockerfile index 9b59c7ac..7d4b7df2 100644 --- a/1.15/buster/Dockerfile +++ b/1.15/buster/Dockerfile @@ -73,6 +73,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7d67b4b2..ef90a0b8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -53,6 +53,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index f6bbf743..7f98e20a 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -64,6 +64,7 @@ RUN set -eux; \ # https://www.google.com/linuxrepositories/ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796'; \ gpg --batch --verify go.tgz.asc go.tgz; \ + gpgconf --kill all; \ rm -rf "$GNUPGHOME" go.tgz.asc; \ \ tar -C /usr/local -xzf go.tgz; \