Skip to content

Commit 7a79468

Browse files
tianontianon
committed
Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
Also, this removes the not-recommended usage of "travis_retry" and adds "gpgconf --kill all".
1 parent a70575c commit 7a79468

25 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ install:
3737

3838
before_script:
3939
- env | sort
40+
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
4041
- cd "$VERSION/$VARIANT"
4142
- slash='/'; image="python:${VERSION}-${VARIANT//$slash/-}"
4243

@@ -45,7 +46,7 @@ script:
4546
(
4647
set -Eeuo pipefail
4748
set -x
48-
travis_retry docker build -t "$image" .
49+
docker build -t "$image" .
4950
~/official-images/test/run.sh "$image"
5051
if [ -d onbuild ]; then
5152
onbuildFrom="$(awk 'toupper($1) == "FROM" { print $2; exit }' onbuild/Dockerfile)"

‎3.4/alpine3.7/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN set -ex \
3232
&& export GNUPGHOME="$(mktemp -d)" \
3333
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3434
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
35+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3536
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3637
&& mkdir -p /usr/src/python \
3738
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.4/jessie/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN set -ex \
2828
&& export GNUPGHOME="$(mktemp -d)" \
2929
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3030
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
31+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3132
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3233
&& mkdir -p /usr/src/python \
3334
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.4/jessie/slim/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ RUN set -ex \
5252
&& export GNUPGHOME="$(mktemp -d)" \
5353
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
5454
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
55+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
5556
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
5657
&& mkdir -p /usr/src/python \
5758
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.4/stretch/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN set -ex \
3030
&& export GNUPGHOME="$(mktemp -d)" \
3131
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3232
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
33+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3334
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3435
&& mkdir -p /usr/src/python \
3536
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.4/stretch/slim/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ RUN set -ex \
5252
&& export GNUPGHOME="$(mktemp -d)" \
5353
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
5454
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
55+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
5556
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
5657
&& mkdir -p /usr/src/python \
5758
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.4/wheezy/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN set -ex \
2828
&& export GNUPGHOME="$(mktemp -d)" \
2929
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3030
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
31+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3132
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3233
&& mkdir -p /usr/src/python \
3334
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.5/alpine3.7/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN set -ex \
3232
&& export GNUPGHOME="$(mktemp -d)" \
3333
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3434
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
35+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3536
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3637
&& mkdir -p /usr/src/python \
3738
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.5/jessie/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN set -ex \
2828
&& export GNUPGHOME="$(mktemp -d)" \
2929
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3030
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
31+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
3132
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3233
&& mkdir -p /usr/src/python \
3334
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

‎3.5/jessie/slim/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ RUN set -ex \
5252
&& export GNUPGHOME="$(mktemp -d)" \
5353
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
5454
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
55+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
5556
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
5657
&& mkdir -p /usr/src/python \
5758
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \

0 commit comments

Comments
 (0)