From 13c512c0250e86d1b1a48200daa8d041d24b1894 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Jul 2018 10:25:23 -0700 Subject: [PATCH] Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues --- .travis.yml | 14 ++++++++++---- 3.6-rc/alpine/Dockerfile | 1 + 3.6-rc/debian/Dockerfile | 2 ++ 3.6/alpine/Dockerfile | 1 + 3.6/debian/Dockerfile | 2 ++ 3.7-rc/alpine/Dockerfile | 1 + 3.7-rc/debian/Dockerfile | 1 + 3.7/alpine/Dockerfile | 1 + 3.7/debian/Dockerfile | 2 ++ 9 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec31bcd3..321fcf48 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/$VARIANT" - image="$(awk 'toupper($1) == "FROM" { print $2; exit }' management/Dockerfile)" script: - - travis_retry docker build -t "$image" . - - ~/official-images/test/run.sh "$image" - - travis_retry docker build -t "${image}-management" management - - ~/official-images/test/run.sh "${image}-management" + - | + ( + set -Eeuo pipefail + set -x + docker build -t "$image" . + ~/official-images/test/run.sh "$image" + docker build -t "${image}-management" management + ~/official-images/test/run.sh "${image}-management" + ) after_script: - docker images diff --git a/3.6-rc/alpine/Dockerfile b/3.6-rc/alpine/Dockerfile index 0a7f41e9..b17c2559 100644 --- a/3.6-rc/alpine/Dockerfile +++ b/3.6-rc/alpine/Dockerfile @@ -55,6 +55,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ mkdir -p "$RABBITMQ_HOME"; \ diff --git a/3.6-rc/debian/Dockerfile b/3.6-rc/debian/Dockerfile index 292fdc14..a6ade63e 100644 --- a/3.6-rc/debian/Dockerfile +++ b/3.6-rc/debian/Dockerfile @@ -31,6 +31,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ chmod +x /usr/local/bin/gosu; \ @@ -91,6 +92,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.deb.asc rabbitmq-server.deb; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ apt install -y --no-install-recommends ./rabbitmq-server.deb; \ diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile index b5ecb435..449f36a5 100644 --- a/3.6/alpine/Dockerfile +++ b/3.6/alpine/Dockerfile @@ -55,6 +55,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ mkdir -p "$RABBITMQ_HOME"; \ diff --git a/3.6/debian/Dockerfile b/3.6/debian/Dockerfile index 17154084..11e67721 100644 --- a/3.6/debian/Dockerfile +++ b/3.6/debian/Dockerfile @@ -31,6 +31,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ chmod +x /usr/local/bin/gosu; \ @@ -91,6 +92,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.deb.asc rabbitmq-server.deb; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ apt install -y --no-install-recommends ./rabbitmq-server.deb; \ diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index d73c777e..087538cc 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -55,6 +55,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ mkdir -p "$RABBITMQ_HOME"; \ diff --git a/3.7-rc/debian/Dockerfile b/3.7-rc/debian/Dockerfile index a3617644..66d7506e 100644 --- a/3.7-rc/debian/Dockerfile +++ b/3.7-rc/debian/Dockerfile @@ -112,6 +112,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.deb.asc rabbitmq-server.deb; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ apt install -y --no-install-recommends ./rabbitmq-server.deb; \ diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index 3270b739..8a08f0ef 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -55,6 +55,7 @@ RUN set -ex; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.tar.xz.asc rabbitmq-server.tar.xz; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ mkdir -p "$RABBITMQ_HOME"; \ diff --git a/3.7/debian/Dockerfile b/3.7/debian/Dockerfile index cef3672b..188d22de 100644 --- a/3.7/debian/Dockerfile +++ b/3.7/debian/Dockerfile @@ -31,6 +31,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ \ chmod +x /usr/local/bin/gosu; \ @@ -112,6 +113,7 @@ RUN set -eux; \ export GNUPGHOME="$(mktemp -d)"; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$RABBITMQ_GPG_KEY"; \ gpg --batch --verify rabbitmq-server.deb.asc rabbitmq-server.deb; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ \ apt install -y --no-install-recommends ./rabbitmq-server.deb; \