diff --git a/.travis.yml b/.travis.yml index 6bf8bdd..c3809ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,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="httpd:${VERSION}${VARIANT:+-$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/2.4/Dockerfile b/2.4/Dockerfile index b2af982..1e98418 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -110,6 +110,7 @@ RUN set -eux; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" httpd.tar.bz2.asc; \ \ mkdir -p src; \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 73b6273..1f3e1d5 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -91,6 +91,7 @@ RUN set -eux; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" httpd.tar.bz2.asc; \ \ mkdir -p src; \