Update to Jetty 9.4.14, add JRE 11 #5406
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Also includes GPG "Happy Eyes" build stability improvements
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index d9286d3..5c49ec3 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,10 @@
+jetty:9-jre11 @ amd64
+jetty:9-jre11 @ arm32v5
+jetty:9-jre11 @ arm32v7
+jetty:9-jre11 @ arm64v8
+jetty:9-jre11 @ i386
+jetty:9-jre11 @ ppc64le
+jetty:9-jre11 @ s390x
jetty:9.2-jre8 @ amd64
jetty:9.2-jre8 @ arm32v5
jetty:9.2-jre8 @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 69371a7..db6fb9b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,6 +3,7 @@ jetty:9-alpine
jetty:9-jre7
jetty:9-jre8
jetty:9-jre8-alpine
+jetty:9-jre11
jetty:9.2
jetty:9.2-jre7
jetty:9.2-jre8
@@ -21,10 +22,12 @@ jetty:9.4
jetty:9.4-alpine
jetty:9.4-jre8
jetty:9.4-jre8-alpine
-jetty:9.4.12
+jetty:9.4-jre11
jetty:9.4.12-alpine
-jetty:9.4.12-jre8
jetty:9.4.12-jre8-alpine
+jetty:9.4.14
+jetty:9.4.14-jre8
+jetty:9.4.14-jre11
jetty:alpine
jetty:jre7
jetty:jre8
diff --git a/jetty_jre8/Dockerfile b/jetty_9-jre11/Dockerfile
similarity index 97%
copy from jetty_jre8/Dockerfile
copy to jetty_9-jre11/Dockerfile
index f105bb6..57d8dd6 100644
--- a/jetty_jre8/Dockerfile
+++ b/jetty_9-jre11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre
+FROM openjdk:11-jre
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN groupadd -r jetty && useradd -r -g jetty jetty
@@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH
RUN mkdir -p "$JETTY_HOME"
WORKDIR $JETTY_HOME
-ENV JETTY_VERSION 9.4.12.v20180830
+ENV JETTY_VERSION 9.4.14.v20181114
ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/$JETTY_VERSION/jetty-home-$JETTY_VERSION.tar.gz
# GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt)
diff --git a/jetty_9.2-jre8/docker-entrypoint.sh b/jetty_9-jre11/docker-entrypoint.sh
similarity index 100%
copy from jetty_9.2-jre8/docker-entrypoint.sh
copy to jetty_9-jre11/docker-entrypoint.sh
diff --git a/jetty_9.2-jre8/generate-jetty-start.sh b/jetty_9-jre11/generate-jetty-start.sh
similarity index 100%
copy from jetty_9.2-jre8/generate-jetty-start.sh
copy to jetty_9-jre11/generate-jetty-start.sh
diff --git a/jetty_9.2-jre8/Dockerfile b/jetty_9.2-jre8/Dockerfile
index a9a67e9..33e996a 100644
--- a/jetty_9.2-jre8/Dockerfile
+++ b/jetty_9.2-jre8/Dockerfile
@@ -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 \
diff --git a/jetty_9.3-jre8-alpine/Dockerfile b/jetty_9.3-jre8-alpine/Dockerfile
index 82733ab..365d191 100644
--- a/jetty_9.3-jre8-alpine/Dockerfile
+++ b/jetty_9.3-jre8-alpine/Dockerfile
@@ -33,13 +33,14 @@ 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/* ./ \
@@ -47,7 +48,7 @@ RUN set -xe \
&& 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 \
diff --git a/jetty_9.3-jre8/Dockerfile b/jetty_9.3-jre8/Dockerfile
index b1d2861..e0f47e9 100644
--- a/jetty_9.3-jre8/Dockerfile
+++ b/jetty_9.3-jre8/Dockerfile
@@ -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 \
diff --git a/jetty_jre7/Dockerfile b/jetty_jre7/Dockerfile
index c28d83b..8a88cd2 100644
--- a/jetty_jre7/Dockerfile
+++ b/jetty_jre7/Dockerfile
@@ -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" \
&& tar -xvf jetty.tar.gz --strip-components=1 \
diff --git a/jetty_jre8-alpine/Dockerfile b/jetty_jre8-alpine/Dockerfile
index ae49a6f..7684174 100644
--- a/jetty_jre8-alpine/Dockerfile
+++ b/jetty_jre8-alpine/Dockerfile
@@ -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 \
diff --git a/jetty_jre8/Dockerfile b/jetty_jre8/Dockerfile
index f105bb6..ab80fce 100644
--- a/jetty_jre8/Dockerfile
+++ b/jetty_jre8/Dockerfile
@@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH
RUN mkdir -p "$JETTY_HOME"
WORKDIR $JETTY_HOME
-ENV JETTY_VERSION 9.4.12.v20180830
+ENV JETTY_VERSION 9.4.14.v20181114
ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/$JETTY_VERSION/jetty-home-$JETTY_VERSION.tar.gz
# GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt)
@@ -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 \ |
|
Build test of #5406; 8874d3d; $ bashbrew build jetty:9.4.14-jre11
Building bashbrew/cache:05f8fae1f0a026b30ef6ada379091add35c4da835c5893f04539262b1e7784b4 (jetty:9.4.14-jre11)
Tagging jetty:9.4.14-jre11
Tagging jetty:9.4-jre11
Tagging jetty:9-jre11
$ test/run.sh jetty:9.4.14-jre11
testing jetty:9.4.14-jre11
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5].....passed
$ bashbrew build jetty:9.4.14
Building bashbrew/cache:d2212239762f10e21c92bba6a16df151b1b781ab6708360e86242bad42c37e7a (jetty:9.4.14)
Tagging jetty:9.4.14
Tagging jetty:9.4
Tagging jetty:9
Tagging jetty:9.4.14-jre8
Tagging jetty:9.4-jre8
Tagging jetty:9-jre8
Tagging jetty:latest
Tagging jetty:jre8
$ test/run.sh jetty:9.4.14
testing jetty:9.4.14
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5]....passed
$ bashbrew build jetty:9.4.12-alpine
Building bashbrew/cache:652e52f110216129319944dc37e2edc84ae4efc16992233e19b0696e74b8b965 (jetty:9.4.12-alpine)
Tagging jetty:9.4.12-alpine
Tagging jetty:9.4-alpine
Tagging jetty:9-alpine
Tagging jetty:9.4.12-jre8-alpine
Tagging jetty:9.4-jre8-alpine
Tagging jetty:9-jre8-alpine
Tagging jetty:alpine
Tagging jetty:jre8-alpine
$ test/run.sh jetty:9.4.12-alpine
testing jetty:9.4.12-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5]....passed
$ bashbrew build jetty:9.3.24
Building bashbrew/cache:e038e0ff2819ee7d8dc26d195ac8b6002607fb0a91c830b0c62ae4fc6dea6f21 (jetty:9.3.24)
Tagging jetty:9.3.24
Tagging jetty:9.3
Tagging jetty:9.3.24-jre8
Tagging jetty:9.3-jre8
$ test/run.sh jetty:9.3.24
testing jetty:9.3.24
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5]....passed
$ bashbrew build jetty:9.3.24-alpine
Building bashbrew/cache:2bc4197825027b07964aacd9d9e361a05e32dec3093db8fd18291e19e98bf473 (jetty:9.3.24-alpine)
Tagging jetty:9.3.24-alpine
Tagging jetty:9.3-alpine
Tagging jetty:9.3.24-jre8-alpine
Tagging jetty:9.3-jre8-alpine
$ test/run.sh jetty:9.3.24-alpine
testing jetty:9.3.24-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5]....passed
$ bashbrew build jetty:9.2.26
Building bashbrew/cache:5555bdeea7ba4b987e835d0f8aac3ba1b6b2fb436b132affc76b5d2eb936242d (jetty:9.2.26)
Tagging jetty:9.2.26
Tagging jetty:9.2
Tagging jetty:9.2.26-jre8
Tagging jetty:9.2-jre8
$ test/run.sh jetty:9.2.26
testing jetty:9.2.26
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5]....passed
$ bashbrew build jetty:9.2.26-jre7
Building bashbrew/cache:62fe3e9f18ff646e36fca135b8107363063983da4418454b17ee8f5a1a26e5f3 (jetty:9.2.26-jre7)
Tagging jetty:9.2.26-jre7
Tagging jetty:9.2-jre7
Tagging jetty:9-jre7
Tagging jetty:jre7
$ test/run.sh jetty:9.2.26-jre7
testing jetty:9.2.26-jre7
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'jetty-hello-web' [5/5].....passed
|
|
Looks good, although I'll send a PR to the jetty repo to fix the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Pull Requests: appropriate/docker-jetty#99, appropriate/docker-jetty#101