diff --git a/.travis.yml b/.travis.yml index e6f9b5b0..bae4dcd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,12 +30,18 @@ install: before_script: - env | sort + - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - cd "$VERSION/$VARIANT" - image="tomcat:$VERSION-$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/7/jre7-alpine/Dockerfile b/7/jre7-alpine/Dockerfile index 212996ba..aeac5528 100644 --- a/7/jre7-alpine/Dockerfile +++ b/7/jre7-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/7/jre7-slim/Dockerfile b/7/jre7-slim/Dockerfile index 6e102e65..cea20095 100644 --- a/7/jre7-slim/Dockerfile +++ b/7/jre7-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/7/jre7/Dockerfile b/7/jre7/Dockerfile index 20e4638d..e103910f 100644 --- a/7/jre7/Dockerfile +++ b/7/jre7/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/7/jre8-alpine/Dockerfile b/7/jre8-alpine/Dockerfile index e0793d2c..8a849940 100644 --- a/7/jre8-alpine/Dockerfile +++ b/7/jre8-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/7/jre8-slim/Dockerfile b/7/jre8-slim/Dockerfile index b27be742..5188e22a 100644 --- a/7/jre8-slim/Dockerfile +++ b/7/jre8-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/7/jre8/Dockerfile b/7/jre8/Dockerfile index 1e4c23cc..06987e03 100644 --- a/7/jre8/Dockerfile +++ b/7/jre8/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre7-alpine/Dockerfile b/8.0/jre7-alpine/Dockerfile index 73559eb2..c8b4709c 100644 --- a/8.0/jre7-alpine/Dockerfile +++ b/8.0/jre7-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre7-slim/Dockerfile b/8.0/jre7-slim/Dockerfile index d4efea78..641e54e6 100644 --- a/8.0/jre7-slim/Dockerfile +++ b/8.0/jre7-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre7/Dockerfile b/8.0/jre7/Dockerfile index 1707f2d7..4c3df603 100644 --- a/8.0/jre7/Dockerfile +++ b/8.0/jre7/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre8-alpine/Dockerfile b/8.0/jre8-alpine/Dockerfile index 9ccd057e..5c347041 100644 --- a/8.0/jre8-alpine/Dockerfile +++ b/8.0/jre8-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre8-slim/Dockerfile b/8.0/jre8-slim/Dockerfile index 653e77d3..b87dd00d 100644 --- a/8.0/jre8-slim/Dockerfile +++ b/8.0/jre8-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.0/jre8/Dockerfile b/8.0/jre8/Dockerfile index bba8ba5c..a3c1ec0f 100644 --- a/8.0/jre8/Dockerfile +++ b/8.0/jre8/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.5/jre10-slim/Dockerfile b/8.5/jre10-slim/Dockerfile index 2c2862a6..c1e80527 100644 --- a/8.5/jre10-slim/Dockerfile +++ b/8.5/jre10-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.5/jre10/Dockerfile b/8.5/jre10/Dockerfile index c48ec055..f729074c 100644 --- a/8.5/jre10/Dockerfile +++ b/8.5/jre10/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.5/jre8-alpine/Dockerfile b/8.5/jre8-alpine/Dockerfile index aac8fb3c..8783aafe 100644 --- a/8.5/jre8-alpine/Dockerfile +++ b/8.5/jre8-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.5/jre8-slim/Dockerfile b/8.5/jre8-slim/Dockerfile index 5fbc4824..57ca95a9 100644 --- a/8.5/jre8-slim/Dockerfile +++ b/8.5/jre8-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/8.5/jre8/Dockerfile b/8.5/jre8/Dockerfile index 99ebcde0..61a8a395 100644 --- a/8.5/jre8/Dockerfile +++ b/8.5/jre8/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/9.0/jre10-slim/Dockerfile b/9.0/jre10-slim/Dockerfile index 34fd290e..2fa57267 100644 --- a/9.0/jre10-slim/Dockerfile +++ b/9.0/jre10-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/9.0/jre10/Dockerfile b/9.0/jre10/Dockerfile index 4119c96b..9533f698 100644 --- a/9.0/jre10/Dockerfile +++ b/9.0/jre10/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/9.0/jre8-alpine/Dockerfile b/9.0/jre8-alpine/Dockerfile index c25677a2..3702c048 100644 --- a/9.0/jre8-alpine/Dockerfile +++ b/9.0/jre8-alpine/Dockerfile @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/9.0/jre8-slim/Dockerfile b/9.0/jre8-slim/Dockerfile index 00ee8bcc..f28a8421 100644 --- a/9.0/jre8-slim/Dockerfile +++ b/9.0/jre8-slim/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/9.0/jre8/Dockerfile b/9.0/jre8/Dockerfile index 225b7d06..638d3403 100644 --- a/9.0/jre8/Dockerfile +++ b/9.0/jre8/Dockerfile @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6c922250..edd321e2 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -70,6 +70,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \ diff --git a/Dockerfile.template b/Dockerfile.template index bd37c496..2dc324a4 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -108,6 +108,7 @@ RUN set -eux; \ tar -xvf tomcat.tar.gz --strip-components=1; \ rm bin/*.bat; \ rm tomcat.tar.gz*; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ nativeBuildDir="$(mktemp -d)"; \