Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Add "gpgconf --kill all" (and pgp-happy-eyeballs in CI) to help cut down on general GPG keyserver flakiness #101

Merged
merged 3 commits into from
Feb 6, 2019
Merged

Add "gpgconf --kill all" (and pgp-happy-eyeballs in CI) to help cut down on general GPG keyserver flakiness #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1bac1f
Add "gpgconf --kill all" (and pgp-happy-eyeballs in CI) to help cut d…
tianon Feb 5, 2019
d8d81a8
Add "--batch" to all "gpg" invocations
tianon Feb 5, 2019
8b52914
Update Alpine variants as well
tianon Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ install:

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

Expand Down
2 changes: 1 addition & 1 deletion 9.2-jre7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -xe \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& rm -rf "$GNUPGHOME" \
md5 marked this conversation as resolved.
Show resolved Hide resolved
&& tar -xvf jetty.tar.gz --strip-components=1 \
Expand Down
3 changes: 2 additions & 1 deletion 9.2-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ RUN set -xe \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \
&& tar -xvf jetty.tar.gz --strip-components=1 \
&& sed -i '/jetty-logging/d' etc/jetty.conf \
Expand Down
3 changes: 2 additions & 1 deletion 9.3-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ RUN set -xe \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \
&& tar -xvf jetty.tar.gz --strip-components=1 \
&& sed -i '/jetty-logging/d' etc/jetty.conf \
Expand Down
7 changes: 4 additions & 3 deletions 9.3-jre8/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,22 @@ ENV JETTY_GPG_KEYS \
RUN set -xe \
# Install required packages for build time. Will be removed when build finishes.
&& apk add --no-cache --virtual .build-deps gnupg curl \

\
&& curl -SL "$JETTY_TGZ_URL" -o jetty.tar.gz \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \
&& tar -xvzf jetty.tar.gz \
&& mv jetty-distribution-$JETTY_VERSION/* ./ \
&& sed -i '/jetty-logging/d' etc/jetty.conf \
&& rm -fr demo-base javadoc \
&& rm jetty.tar.gz* \
&& rm -fr jetty-distribution-$JETTY_VERSION/ \

\
# Remove installed packages and various cleanup
&& apk del .build-deps \
&& rm -fr .build-deps \
Expand Down
3 changes: 2 additions & 1 deletion 9.4-jre8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ RUN set -xe \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \
&& tar -xvf jetty.tar.gz --strip-components=1 \
&& sed -i '/jetty-logging/d' etc/jetty.conf \
Expand Down
7 changes: 4 additions & 3 deletions 9.4-jre8/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,21 @@ ENV JETTY_GPG_KEYS \
RUN set -xe \
# Install required packages for build time. Will be removed when build finishes.
&& apk add --no-cache --virtual .build-deps gnupg curl \

\
&& curl -SL "$JETTY_TGZ_URL" -o jetty.tar.gz \
&& curl -SL "$JETTY_TGZ_URL.asc" -o jetty.tar.gz.asc \
&& export GNUPGHOME="$(mktemp -d)" \
&& for key in $JETTY_GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; done \
&& gpg --batch --verify jetty.tar.gz.asc jetty.tar.gz \
&& gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \
&& tar -xvzf jetty.tar.gz \
&& mv jetty-home-$JETTY_VERSION/* ./ \
&& sed -i '/jetty-logging/d' etc/jetty.conf \
&& rm jetty.tar.gz* \
&& rm -fr jetty-home-$JETTY_VERSION/ \

\
# Remove installed packages and various cleanup
&& apk del .build-deps \
&& rm -fr .build-deps \
Expand Down