From b250a22ce67cd1232c11e0c17a0f1708ced6f4af Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 11 Jun 2018 16:55:51 -0700 Subject: [PATCH] Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues Also, this removes the not-recommended usage of "travis_retry" and adds "gpgconf --kill all". --- .travis.yml | 10 ++++++++-- 5.6/alpine3.7/cli/Dockerfile | 1 + 5.6/alpine3.7/fpm/Dockerfile | 1 + 5.6/alpine3.7/zts/Dockerfile | 1 + 5.6/jessie/apache/Dockerfile | 1 + 5.6/jessie/cli/Dockerfile | 1 + 5.6/jessie/fpm/Dockerfile | 1 + 5.6/jessie/zts/Dockerfile | 1 + 5.6/stretch/apache/Dockerfile | 1 + 5.6/stretch/cli/Dockerfile | 1 + 5.6/stretch/fpm/Dockerfile | 1 + 5.6/stretch/zts/Dockerfile | 1 + 7.0/alpine3.7/cli/Dockerfile | 1 + 7.0/alpine3.7/fpm/Dockerfile | 1 + 7.0/alpine3.7/zts/Dockerfile | 1 + 7.0/jessie/apache/Dockerfile | 1 + 7.0/jessie/cli/Dockerfile | 1 + 7.0/jessie/fpm/Dockerfile | 1 + 7.0/jessie/zts/Dockerfile | 1 + 7.0/stretch/apache/Dockerfile | 1 + 7.0/stretch/cli/Dockerfile | 1 + 7.0/stretch/fpm/Dockerfile | 1 + 7.0/stretch/zts/Dockerfile | 1 + 7.1/alpine3.7/cli/Dockerfile | 1 + 7.1/alpine3.7/fpm/Dockerfile | 1 + 7.1/alpine3.7/zts/Dockerfile | 1 + 7.1/jessie/apache/Dockerfile | 1 + 7.1/jessie/cli/Dockerfile | 1 + 7.1/jessie/fpm/Dockerfile | 1 + 7.1/jessie/zts/Dockerfile | 1 + 7.1/stretch/apache/Dockerfile | 1 + 7.1/stretch/cli/Dockerfile | 1 + 7.1/stretch/fpm/Dockerfile | 1 + 7.1/stretch/zts/Dockerfile | 1 + 7.2/alpine3.6/cli/Dockerfile | 1 + 7.2/alpine3.6/fpm/Dockerfile | 1 + 7.2/alpine3.6/zts/Dockerfile | 1 + 7.2/alpine3.7/cli/Dockerfile | 1 + 7.2/alpine3.7/fpm/Dockerfile | 1 + 7.2/alpine3.7/zts/Dockerfile | 1 + 7.2/stretch/apache/Dockerfile | 1 + 7.2/stretch/cli/Dockerfile | 1 + 7.2/stretch/fpm/Dockerfile | 1 + 7.2/stretch/zts/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 46 files changed, 53 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89aab1ad98..eb6bbdee13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,13 +51,19 @@ install: before_script: - env | sort + - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - cd "$VERSION/$VARIANT" - SUBVARIANT="${VARIANT#*/}" - image="php:${VERSION}-${SUBVARIANT}-${VARIANT%/*}" script: - - travis_retry docker build -t "$image" . - - ~/official-images/test/run.sh "$image" + - | + ( + set -Eeuo pipefail + set -x + docker build -t "$image" . + ~/official-images/test/run.sh "$image" + ) after_script: - docker images diff --git a/5.6/alpine3.7/cli/Dockerfile b/5.6/alpine3.7/cli/Dockerfile index 174ea32ac5..7edf67e511 100644 --- a/5.6/alpine3.7/cli/Dockerfile +++ b/5.6/alpine3.7/cli/Dockerfile @@ -85,6 +85,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/alpine3.7/fpm/Dockerfile b/5.6/alpine3.7/fpm/Dockerfile index 55554fe812..c07a574aa3 100644 --- a/5.6/alpine3.7/fpm/Dockerfile +++ b/5.6/alpine3.7/fpm/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/alpine3.7/zts/Dockerfile b/5.6/alpine3.7/zts/Dockerfile index 8dfefd4445..f47bd20d92 100644 --- a/5.6/alpine3.7/zts/Dockerfile +++ b/5.6/alpine3.7/zts/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/jessie/apache/Dockerfile b/5.6/jessie/apache/Dockerfile index c1e3c6e3c6..bb1e68eff6 100644 --- a/5.6/jessie/apache/Dockerfile +++ b/5.6/jessie/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/jessie/cli/Dockerfile b/5.6/jessie/cli/Dockerfile index 814a27ceec..ecfa3b5e9f 100644 --- a/5.6/jessie/cli/Dockerfile +++ b/5.6/jessie/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/jessie/fpm/Dockerfile b/5.6/jessie/fpm/Dockerfile index 1975b040dd..e367e106f1 100644 --- a/5.6/jessie/fpm/Dockerfile +++ b/5.6/jessie/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/jessie/zts/Dockerfile b/5.6/jessie/zts/Dockerfile index dc1ac59b57..f4eb424fdf 100644 --- a/5.6/jessie/zts/Dockerfile +++ b/5.6/jessie/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/stretch/apache/Dockerfile b/5.6/stretch/apache/Dockerfile index d1088ef3b3..53187a6159 100644 --- a/5.6/stretch/apache/Dockerfile +++ b/5.6/stretch/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/stretch/cli/Dockerfile b/5.6/stretch/cli/Dockerfile index 2b9697b945..6128fd1a33 100644 --- a/5.6/stretch/cli/Dockerfile +++ b/5.6/stretch/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/stretch/fpm/Dockerfile b/5.6/stretch/fpm/Dockerfile index 9c0e6b9841..a0b27e32cd 100644 --- a/5.6/stretch/fpm/Dockerfile +++ b/5.6/stretch/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/5.6/stretch/zts/Dockerfile b/5.6/stretch/zts/Dockerfile index dc8f2d7e5f..d69b903f96 100644 --- a/5.6/stretch/zts/Dockerfile +++ b/5.6/stretch/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/alpine3.7/cli/Dockerfile b/7.0/alpine3.7/cli/Dockerfile index 9c7fd8901f..7c19011d73 100644 --- a/7.0/alpine3.7/cli/Dockerfile +++ b/7.0/alpine3.7/cli/Dockerfile @@ -85,6 +85,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/alpine3.7/fpm/Dockerfile b/7.0/alpine3.7/fpm/Dockerfile index aeb7eb5600..dea3a1c38b 100644 --- a/7.0/alpine3.7/fpm/Dockerfile +++ b/7.0/alpine3.7/fpm/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/alpine3.7/zts/Dockerfile b/7.0/alpine3.7/zts/Dockerfile index 46b67972d1..3308a64f05 100644 --- a/7.0/alpine3.7/zts/Dockerfile +++ b/7.0/alpine3.7/zts/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/jessie/apache/Dockerfile b/7.0/jessie/apache/Dockerfile index 929c84f269..6efc8f22f4 100644 --- a/7.0/jessie/apache/Dockerfile +++ b/7.0/jessie/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/jessie/cli/Dockerfile b/7.0/jessie/cli/Dockerfile index bb8339b73f..12aee04b7b 100644 --- a/7.0/jessie/cli/Dockerfile +++ b/7.0/jessie/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/jessie/fpm/Dockerfile b/7.0/jessie/fpm/Dockerfile index f03fe1a44d..884fd2591b 100644 --- a/7.0/jessie/fpm/Dockerfile +++ b/7.0/jessie/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/jessie/zts/Dockerfile b/7.0/jessie/zts/Dockerfile index 3351bbbc8c..1e942fb55e 100644 --- a/7.0/jessie/zts/Dockerfile +++ b/7.0/jessie/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/stretch/apache/Dockerfile b/7.0/stretch/apache/Dockerfile index 76dc303458..cd93acef06 100644 --- a/7.0/stretch/apache/Dockerfile +++ b/7.0/stretch/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/stretch/cli/Dockerfile b/7.0/stretch/cli/Dockerfile index a2d1b1e62b..f2c8cbeef6 100644 --- a/7.0/stretch/cli/Dockerfile +++ b/7.0/stretch/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/stretch/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile index 22a14ddeba..376ad41ac1 100644 --- a/7.0/stretch/fpm/Dockerfile +++ b/7.0/stretch/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.0/stretch/zts/Dockerfile b/7.0/stretch/zts/Dockerfile index 544b2b78f6..a6c72d614f 100644 --- a/7.0/stretch/zts/Dockerfile +++ b/7.0/stretch/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/alpine3.7/cli/Dockerfile b/7.1/alpine3.7/cli/Dockerfile index ef141954b8..7e3cc01db1 100644 --- a/7.1/alpine3.7/cli/Dockerfile +++ b/7.1/alpine3.7/cli/Dockerfile @@ -85,6 +85,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/alpine3.7/fpm/Dockerfile b/7.1/alpine3.7/fpm/Dockerfile index 518e1da6b7..fa4a72a62f 100644 --- a/7.1/alpine3.7/fpm/Dockerfile +++ b/7.1/alpine3.7/fpm/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/alpine3.7/zts/Dockerfile b/7.1/alpine3.7/zts/Dockerfile index 6fde2d8b84..8c93bc9a81 100644 --- a/7.1/alpine3.7/zts/Dockerfile +++ b/7.1/alpine3.7/zts/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/jessie/apache/Dockerfile b/7.1/jessie/apache/Dockerfile index 2e1359c71c..45ce869b28 100644 --- a/7.1/jessie/apache/Dockerfile +++ b/7.1/jessie/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/jessie/cli/Dockerfile b/7.1/jessie/cli/Dockerfile index 2fcca4d057..843067ece7 100644 --- a/7.1/jessie/cli/Dockerfile +++ b/7.1/jessie/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/jessie/fpm/Dockerfile b/7.1/jessie/fpm/Dockerfile index ab015255db..666b02b986 100644 --- a/7.1/jessie/fpm/Dockerfile +++ b/7.1/jessie/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/jessie/zts/Dockerfile b/7.1/jessie/zts/Dockerfile index a93e51621e..b6e1d2b332 100644 --- a/7.1/jessie/zts/Dockerfile +++ b/7.1/jessie/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile index 735610a962..9c1cd768f7 100644 --- a/7.1/stretch/apache/Dockerfile +++ b/7.1/stretch/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/stretch/cli/Dockerfile b/7.1/stretch/cli/Dockerfile index 3f1f5e9378..028065e5fa 100644 --- a/7.1/stretch/cli/Dockerfile +++ b/7.1/stretch/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/stretch/fpm/Dockerfile b/7.1/stretch/fpm/Dockerfile index b01759c6b7..601c1b298d 100644 --- a/7.1/stretch/fpm/Dockerfile +++ b/7.1/stretch/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.1/stretch/zts/Dockerfile b/7.1/stretch/zts/Dockerfile index 718dfe2810..af3cf185ee 100644 --- a/7.1/stretch/zts/Dockerfile +++ b/7.1/stretch/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.6/cli/Dockerfile b/7.2/alpine3.6/cli/Dockerfile index abeeddda5a..b861274152 100644 --- a/7.2/alpine3.6/cli/Dockerfile +++ b/7.2/alpine3.6/cli/Dockerfile @@ -85,6 +85,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.6/fpm/Dockerfile b/7.2/alpine3.6/fpm/Dockerfile index d42ee4fa09..9d151f98d3 100644 --- a/7.2/alpine3.6/fpm/Dockerfile +++ b/7.2/alpine3.6/fpm/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.6/zts/Dockerfile b/7.2/alpine3.6/zts/Dockerfile index 7a0da23afc..3d595c4bf5 100644 --- a/7.2/alpine3.6/zts/Dockerfile +++ b/7.2/alpine3.6/zts/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.7/cli/Dockerfile b/7.2/alpine3.7/cli/Dockerfile index dc5a4ab07f..acc8df41d9 100644 --- a/7.2/alpine3.7/cli/Dockerfile +++ b/7.2/alpine3.7/cli/Dockerfile @@ -85,6 +85,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.7/fpm/Dockerfile b/7.2/alpine3.7/fpm/Dockerfile index 33a4e468fc..ddf7e2fd66 100644 --- a/7.2/alpine3.7/fpm/Dockerfile +++ b/7.2/alpine3.7/fpm/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/alpine3.7/zts/Dockerfile b/7.2/alpine3.7/zts/Dockerfile index ba3a0a9334..a36e4d595b 100644 --- a/7.2/alpine3.7/zts/Dockerfile +++ b/7.2/alpine3.7/zts/Dockerfile @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index b5a788aa7d..f5c91996d1 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -151,6 +151,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 639beb3746..60026b2670 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -92,6 +92,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index 177b31bfe0..89645987d0 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 68db558cf3..cefc2894d9 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -93,6 +93,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 603d236060..9d665c5a0d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -79,6 +79,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ceb00be734..09aa17aa32 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,6 +86,7 @@ RUN set -xe; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify php.tar.xz.asc php.tar.xz; \ + command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ \