Merge pull request #11 from tianon/pgp-happy-eyeballs

Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
tianon · Jul 30, 2018 · e3d8ed8 · e3d8ed8
2 parents 4e6dad8 + 8b2e730
commit e3d8ed8
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \