diff --git a/.travis.yml b/.travis.yml index e6f9b5b02..bae4dcd8c 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 212996ba6..aeac55285 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 6e102e655..cea20095f 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 20e4638db..e103910fb 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 e0793d2cc..8a8499404 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 b27be742d..5188e22a4 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 1e4c23cce..06987e033 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 73559eb2c..c8b4709c1 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 d4efea789..641e54e65 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 1707f2d7c..4c3df6037 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 9ccd057ed..5c347041c 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 653e77d3b..b87dd00d5 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 bba8ba5c9..a3c1ec0f2 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 2c2862a6d..c1e805274 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 c48ec0555..f729074cc 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 aac8fb3cb..8783aafe4 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 5fbc48244..57ca95a91 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 99ebcde05..61a8a395f 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 34fd290e5..2fa572679 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 4119c96bc..9533f6988 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 c25677a2d..3702c048e 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 00ee8bcce..f28a84210 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 225b7d069..638d34034 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 6c9222504..edd321e24 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 bd37c4961..2dc324a4e 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)"; \