diff --git a/.travis.yml b/.travis.yml index b56eff7..e7f67ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,20 @@ install: before_script: - env | sort + - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - cd "$VERSION" - image="bash:$VERSION" script: - - travis_retry docker build -t "$image" . - - docker run -it --rm "$image" --version - - docker run -it --rm "$image" echo hi - - ~/official-images/test/run.sh "$image" + - | + ( + set -Eeuo pipefail + set -x + docker build -t "$image" . + docker run -it --rm "$image" --version + docker run -it --rm "$image" echo hi + ~/official-images/test/run.sh "$image" + ) after_script: - docker images diff --git a/3.0/Dockerfile b/3.0/Dockerfile index 45c0a38..0bea58c 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/3.1/Dockerfile b/3.1/Dockerfile index 6e48fcf..2a55006 100644 --- a/3.1/Dockerfile +++ b/3.1/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 4ec5078..39f3540 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 2709a78..f33a170 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -49,6 +49,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/4.1/Dockerfile b/4.1/Dockerfile index f1b97a3..f99b387 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 7ac6460..9d27832 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/4.3/Dockerfile b/4.3/Dockerfile index 797ed7c..9b1c151 100644 --- a/4.3/Dockerfile +++ b/4.3/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index c049637..e0a34b2 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -48,6 +48,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$_BASH_GPG_KEY"; \ gpg --batch --verify bash.tar.gz.sig bash.tar.gz; \ + gpgconf --kill all; \ rm bash.tar.gz.sig; \ if [ -d bash-patches ]; then \ for sig in bash-patches/*.sig; do \