Skip to content

Commit

Permalink
Merge pull request #127 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
@tianon
tianon authored Jul 30, 2018
2 parents 6d19b06 + 1383c55 commit 94b99b6
Show file tree
Hide file tree
Showing 25 changed files with 32 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 @@ -30,12 +30,18 @@ install:

before_script:
- env | sort
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
- cd "$VERSION/$VARIANT"
- image="tomcat:$VERSION-$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 7/jre7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 7/jre7-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 7/jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 7/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 7/jre8-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 7/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre7-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre8-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.0/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.5/jre10-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.5/jre10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.5/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.5/jre8-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 8.5/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 9.0/jre10-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 9.0/jre10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 9.0/jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 9.0/jre8-slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions 9.0/jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
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 @@ -70,6 +70,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ RUN set -eux; \
tar -xvf tomcat.tar.gz --strip-components=1; \
rm bin/*.bat; \
rm tomcat.tar.gz*; \
command -v gpgconf && gpgconf --kill all || :; \
rm -rf "$GNUPGHOME"; \
\
nativeBuildDir="$(mktemp -d)"; \
Expand Down

0 comments on commit 94b99b6

Please sign in to comment.