Skip to content

Commit

Permalink
Merge pull request #666 from infosiftr/pgp-happy-eyeballs
Browse files Browse the repository at this point in the history 
Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
  • Loading branch information
@yosifkit
yosifkit authored Jun 18, 2018
2 parents eddb30e + b250a22 commit 5cd17f2
Show file tree
Hide file tree
Showing 46 changed files with 53 additions and 2 deletions.
10 changes: 8 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,19 @@ install:

before_script:
- env | sort
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
- cd "$VERSION/$VARIANT"
- SUBVARIANT="${VARIANT#*/}"
- image="php:${VERSION}-${SUBVARIANT}-${VARIANT%/*}"

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
Expand Down
1 change: 1 addition & 0 deletions 5.6/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 5.6/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.0/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/jessie/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/jessie/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/jessie/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/jessie/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.1/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.6/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.6/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.6/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.7/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.7/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/alpine3.7/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/stretch/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/stretch/cli/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/stretch/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions 7.2/stretch/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ RUN set -xe; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
fi; \
\
Expand Down

0 comments on commit 5cd17f2

Please sign in to comment.