Skip to content

Commit 635fd0b

Browse files
tianontianon
committed
Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
1 parent 5d0b6ad commit 635fd0b

File tree

8 files changed

+16
-1
lines changed

8 files changed

+16
-1
lines changed

‎.travis.yml

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

2727
before_script:
2828
- env | sort
29+
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
2930
- cd "$VERSION/$VARIANT"
3031
- image="postgres:${VERSION}${VARIANT:+-${VARIANT}}"
3132

@@ -40,7 +41,7 @@ script:
4041
sed -ri -e 's/amd64[|]//g' Dockerfile
4142
! grep -qE 'amd64[|]' Dockerfile
4243
fi
43-
travis_retry docker build -t "$image" .
44+
docker build -t "$image" .
4445
~/official-images/test/run.sh "$image"
4546
)
4647

‎10/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎11/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎9.3/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎9.4/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎9.5/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎9.6/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

‎Dockerfile-debian.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
2627
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2728
&& chmod +x /usr/local/bin/gosu \
2829
&& gosu nobody true \
@@ -58,6 +59,7 @@ RUN set -ex; \
5859
export GNUPGHOME="$(mktemp -d)"; \
5960
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
6061
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
62+
command -v gpgconf > /dev/null && gpgconf --kill all; \
6163
rm -rf "$GNUPGHOME"; \
6264
apt-key list
6365

0 commit comments

Comments
 (0)