Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jetty 9.3.18 #2835

Merged
merged 1 commit into from
Apr 7, 2017
Merged

Jetty 9.3.18 #2835

merged 1 commit into from
Apr 7, 2017

Conversation

md5
Copy link
Contributor

@md5 md5 commented Apr 7, 2017

No description provided.

@tianon
Copy link
Member

tianon commented Apr 7, 2017

Diff:

diff --git a/_bashbrew-list b/_bashbrew-list
index 74056cb..d6b9682 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -13,10 +13,10 @@ jetty:9.3
 jetty:9.3-alpine
 jetty:9.3-jre8
 jetty:9.3-jre8-alpine
-jetty:9.3.17
-jetty:9.3.17-alpine
-jetty:9.3.17-jre8
-jetty:9.3.17-jre8-alpine
+jetty:9.3.18
+jetty:9.3.18-alpine
+jetty:9.3.18-jre8
+jetty:9.3.18-jre8-alpine
 jetty:9.4
 jetty:9.4-alpine
 jetty:9.4-jre8
diff --git a/jetty_9.3-jre8-alpine/Dockerfile b/jetty_9.3-jre8-alpine/Dockerfile
index a1b3bb8..7d08e86 100644
--- a/jetty_9.3-jre8-alpine/Dockerfile
+++ b/jetty_9.3-jre8-alpine/Dockerfile
@@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH
 RUN mkdir -p "$JETTY_HOME"
 WORKDIR $JETTY_HOME
 
-ENV JETTY_VERSION 9.3.17.v20170317
+ENV JETTY_VERSION 9.3.18.v20170406
 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$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.3-jre8/Dockerfile b/jetty_9.3-jre8/Dockerfile
index 306bb68..a8c8b6d 100644
--- a/jetty_9.3-jre8/Dockerfile
+++ b/jetty_9.3-jre8/Dockerfile
@@ -8,7 +8,7 @@ ENV PATH $JETTY_HOME/bin:$PATH
 RUN mkdir -p "$JETTY_HOME"
 WORKDIR $JETTY_HOME
 
-ENV JETTY_VERSION 9.3.17.v20170317
+ENV JETTY_VERSION 9.3.18.v20170406
 ENV JETTY_TGZ_URL https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$JETTY_VERSION/jetty-distribution-$JETTY_VERSION.tar.gz
 
 # GPG Keys are personal keys of Jetty committers (see https://github.com/eclipse/jetty.project/blob/0607c0e66e44b9c12a62b85551da3a0edce0281e/KEYS.txt)

@tianon
Copy link
Member

tianon commented Apr 7, 2017

LGTM

Build test of #2835; b637388 (jetty):

$ bashbrew build jetty:9.4.3
Using bashbrew/cache:c4271f2a0350d110f8deac42fc3f1f74bb8033948a30e9293ff0790cacb86261 (jetty:9.4.3)
Tagging jetty:9.4.3
Tagging jetty:9.4
Tagging jetty:9
Tagging jetty:9.4.3-jre8
Tagging jetty:9.4-jre8
Tagging jetty:9-jre8
Tagging jetty:latest
Tagging jetty:jre8

$ test/run.sh jetty:9.4.3
testing jetty:9.4.3
	'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.3-alpine
Using bashbrew/cache:6031e0bfcc16ec486faa84273b4ea0e4c337fbff532ef41010bad2c6cd175ef9 (jetty:9.4.3-alpine)
Tagging jetty:9.4.3-alpine
Tagging jetty:9.4-alpine
Tagging jetty:9-alpine
Tagging jetty:9.4.3-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.3-alpine
testing jetty:9.4.3-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.18
Building bashbrew/cache:89cbedf113baac7b412179acfd187151079f86fb11c140e92094a2d559c2eac8 (jetty:9.3.18)
Tagging jetty:9.3.18
Tagging jetty:9.3
Tagging jetty:9.3.18-jre8
Tagging jetty:9.3-jre8

$ test/run.sh jetty:9.3.18
testing jetty:9.3.18
	'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.18-alpine
Building bashbrew/cache:9eba9d2a5e66ee9e68ad07927cc807a79e2cdabca1532f5846a1f4dce0ec8a55 (jetty:9.3.18-alpine)
Tagging jetty:9.3.18-alpine
Tagging jetty:9.3-alpine
Tagging jetty:9.3.18-jre8-alpine
Tagging jetty:9.3-jre8-alpine

$ test/run.sh jetty:9.3.18-alpine
testing jetty:9.3.18-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.21
Using bashbrew/cache:21a1ec32b628a8202ec7d8c9856ac59c11db57d1c11ea03b8dbb21672ae839ea (jetty:9.2.21)
Tagging jetty:9.2.21
Tagging jetty:9.2
Tagging jetty:9.2.21-jre8
Tagging jetty:9.2-jre8

$ test/run.sh jetty:9.2.21
testing jetty:9.2.21
	'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.21-jre7
Using bashbrew/cache:0922de1f97f4846c5b79bed459a76dd683a56758d614377aadb5a03431229068 (jetty:9.2.21-jre7)
Tagging jetty:9.2.21-jre7
Tagging jetty:9.2-jre7
Tagging jetty:9-jre7
Tagging jetty:jre7

$ test/run.sh jetty:9.2.21-jre7
testing jetty:9.2.21-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

@tianon tianon merged commit 5592f35 into docker-library:master Apr 7, 2017
@md5 md5 deleted the jetty-9.3.18 branch April 8, 2017 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants