From 986cea9cdfbf38ae611bdfbd14f1b1cc17194e0c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Jul 2018 09:36:02 -0700 Subject: [PATCH] Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues --- .travis.yml | 24 +++++++++++++++++------- 2.1/Dockerfile | 2 ++ 2.2/Dockerfile | 2 ++ 3.0/Dockerfile | 2 ++ 3.11/Dockerfile | 2 ++ Dockerfile.template | 2 ++ 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf3e5fb..36294e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,18 +16,28 @@ install: before_script: - env | sort + - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - cd "$VERSION" - image="cassandra:$VERSION" - | - if [ -n "$ARCH" ]; then - from="$(awk '$1 == toupper("FROM") { print $2 }' Dockerfile)" - docker pull "$ARCH/$from" - docker tag "$ARCH/$from" "$from" - fi + ( + set -Eeuo pipefail + set -x + if [ -n "${ARCH:-}" ]; then + from="$(awk '$1 == toupper("FROM") { print $2 }' Dockerfile)" + docker pull "$ARCH/$from" + docker tag "$ARCH/$from" "$from" + fi + ) 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.1/Dockerfile b/2.1/Dockerfile index c9f5a52..5b8f731 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && 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 \ && gosu nobody true \ @@ -48,6 +49,7 @@ RUN set -ex; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/cassandra.gpg; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 89b6780..6a2d888 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && 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 \ && gosu nobody true \ @@ -48,6 +49,7 @@ RUN set -ex; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/cassandra.gpg; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/3.0/Dockerfile b/3.0/Dockerfile index c5b88ca..d4eb8f3 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && 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 \ && gosu nobody true \ @@ -48,6 +49,7 @@ RUN set -ex; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/cassandra.gpg; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/3.11/Dockerfile b/3.11/Dockerfile index c74f969..0a408f4 100644 --- a/3.11/Dockerfile +++ b/3.11/Dockerfile @@ -31,6 +31,7 @@ RUN set -x \ && 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 \ && gosu nobody true \ @@ -48,6 +49,7 @@ RUN set -ex; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/cassandra.gpg; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ apt-key list diff --git a/Dockerfile.template b/Dockerfile.template index 2a490f9..91db84a 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -31,6 +31,7 @@ RUN set -x \ && 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 \ && gosu nobody true \ @@ -48,6 +49,7 @@ RUN set -ex; \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done; \ gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/cassandra.gpg; \ + command -v gpgconf && gpgconf --kill all || :; \ rm -rf "$GNUPGHOME"; \ apt-key list