Merge pull request #104 from infosiftr/pgp-happy-eyeballs

Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
docker-library · Jul 30, 2018 · 87dc2de · 87dc2de
2 parents e639fa0 + 97f7e38
commit 87dc2de
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,12 +12,18 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
+  - cd "$VERSION/$VARIANT"
   - image="owncloud:${VERSION}${VARIANT:+-$VARIANT}"
 
 script:
-  - travis_retry docker build -t "$image" "${VARIANT}"
-  - ~/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/10.0/apache/Dockerfile b/10.0/apache/Dockerfile
@@ -72,6 +72,7 @@ RUN set -eux; \
 # gpg key from https://owncloud.org/owncloud.asc
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys E3036906AD9F30807351FAC32D5D5E97F6978A26; \
 	gpg --batch --verify owncloud.tar.bz2.asc owncloud.tar.bz2; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" owncloud.tar.bz2.asc; \
 	tar -xjf owncloud.tar.bz2 -C /usr/src/; \
 	rm owncloud.tar.bz2

diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile
@@ -71,6 +71,7 @@ RUN set -eux; \
 # gpg key from https://owncloud.org/owncloud.asc
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys E3036906AD9F30807351FAC32D5D5E97F6978A26; \
 	gpg --batch --verify owncloud.tar.bz2.asc owncloud.tar.bz2; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" owncloud.tar.bz2.asc; \
 	tar -xjf owncloud.tar.bz2 -C /usr/src/; \
 	rm owncloud.tar.bz2

diff --git a/9.1/apache/Dockerfile b/9.1/apache/Dockerfile
@@ -72,6 +72,7 @@ RUN set -eux; \
 # gpg key from https://owncloud.org/owncloud.asc
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys E3036906AD9F30807351FAC32D5D5E97F6978A26; \
 	gpg --batch --verify owncloud.tar.bz2.asc owncloud.tar.bz2; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" owncloud.tar.bz2.asc; \
 	tar -xjf owncloud.tar.bz2 -C /usr/src/; \
 	rm owncloud.tar.bz2

diff --git a/9.1/fpm/Dockerfile b/9.1/fpm/Dockerfile
@@ -71,6 +71,7 @@ RUN set -eux; \
 # gpg key from https://owncloud.org/owncloud.asc
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys E3036906AD9F30807351FAC32D5D5E97F6978A26; \
 	gpg --batch --verify owncloud.tar.bz2.asc owncloud.tar.bz2; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" owncloud.tar.bz2.asc; \
 	tar -xjf owncloud.tar.bz2 -C /usr/src/; \
 	rm owncloud.tar.bz2

diff --git a/Dockerfile.template b/Dockerfile.template
@@ -72,6 +72,7 @@ RUN set -eux; \
 # gpg key from https://owncloud.org/owncloud.asc
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys E3036906AD9F30807351FAC32D5D5E97F6978A26; \
 	gpg --batch --verify owncloud.tar.bz2.asc owncloud.tar.bz2; \
+	command -v gpgconf && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" owncloud.tar.bz2.asc; \
 	tar -xjf owncloud.tar.bz2 -C /usr/src/; \
 	rm owncloud.tar.bz2