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

Update jetty:9-jre* images to Jetty 9.2.8 #501

Merged
merged 1 commit into from
Feb 20, 2015
Merged

Update jetty:9-jre* images to Jetty 9.2.8 #501

merged 1 commit into from
Feb 20, 2015

Conversation

md5
Copy link
Contributor

@md5 md5 commented Feb 19, 2015

From jetty-announce:

The Highlights:

  • A new AsyncMiddleManServlet has been added to the jetty-proxy module
    to allow organizations to implement content transforming (downstream
    and upstream) services on a proxy setup.
    (documentation is forthcoming)
  • Updated protonego implementations for recently released Java JVMs
  • General bug fixes

This release is considered a maintenance release of the Jetty 9.2 codebase,
while we work on the upcoming Jetty 9.3.0 release with support for HTTP/2.

I'm not sure why the 7 and 8 images are showing up in this diff, but there's nothing wrong with the new shas either (cf. appropriate/docker-jetty@74bdfc4...394a77a).

Also, may I get your opinion on whether I should include the changes needed to address appropriate/docker-jetty#2 and remove Jetty 7 and 8? They were apparently EOL'd at the end of 2014.

Signed-off-by: Mike Dillon <mike@embody.org>
@md5
Copy link
Contributor Author

md5 commented Feb 19, 2015

BTW, those "general bug fixes" include some patches I made to make jetty.sh run work better for future enhancements to this Docker image, so this update would be nice to have.

@yosifkit
Copy link
Member

LGTM.
I would say that if you want to drop 7 and 8, do it after this PR so that they get the demo-base removal. Since they are EOL, it seems reasonable to drop them from further updates and thus the "supported" list in the docs.

Build test of #501; c516288 (jetty):

$ url="https://raw.githubusercontent.com/docker-library/official-images/c516288eebfbe4171a80f94ca29932532991eb80/library/jetty"
$ bashbrew build "$url"
Fetching jetty (git://github.com/md5/docker-jetty) ...
Processing jetty:7.6.16-jre7 ...
Processing jetty:7.6-jre7 ...
Processing jetty:7-jre7 ...
Processing jetty:7.6.16 ...
Processing jetty:7.6 ...
Processing jetty:7 ...
Processing jetty:7.6.16-jre8 ...
Processing jetty:7.6-jre8 ...
Processing jetty:7-jre8 ...
Processing jetty:8.1.16-jre7 ...
Processing jetty:8.1-jre7 ...
Processing jetty:8-jre7 ...
Processing jetty:8.1.16 ...
Processing jetty:8.1 ...
Processing jetty:8 ...
Processing jetty:8.1.16-jre8 ...
Processing jetty:8.1-jre8 ...
Processing jetty:8-jre8 ...
Processing jetty:9.2.8-jre7 ...
Processing jetty:9.2-jre7 ...
Processing jetty:9-jre7 ...
Processing jetty:jre7 ...
Processing jetty:9.2.8 ...
Processing jetty:9.2 ...
Processing jetty:9 ...
Processing jetty:latest ...
Processing jetty:9.2.8-jre8 ...
Processing jetty:9.2-jre8 ...
Processing jetty:9-jre8 ...
Processing jetty:jre8 ...
$ bashbrew list "$url" | xargs test/run.sh
testing jetty:7.6.16-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7.6-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7.6.16
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7.6
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7.6.16-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7.6-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:7-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1.16-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1.16
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1.16-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8.1-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:8-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2.8-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9-jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:jre7
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2.8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:latest
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2.8-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9.2-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:9-jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed
testing jetty:jre8
    'utc' [1/2]...passed
    'cve-2014--shellshock' [2/2]...passed

@md5
Copy link
Contributor Author

md5 commented Feb 19, 2015

The demo-base update is actually a no-op on 7 and 8 since they don't have a demo-base directory. It was a mistake on my part to put that code in their Dockerfiles instead of just the Jetty 9 Dockerfiles.

That actually explains (for me) why 7 and 8 are showing updates without showing any changed files; there were intervening changed that added code to remove demo-base in the 7 and 8 image that got reverted.

@tianon
Copy link
Member

tianon commented Feb 20, 2015

LGTM!

tianon added a commit that referenced this pull request Feb 20, 2015
Update jetty:9-jre* images to Jetty 9.2.8
@tianon tianon merged commit 6da11ce into docker-library:master Feb 20, 2015
@md5 md5 deleted the jetty-9-2-8-update branch February 20, 2015 06:07
@md5
Copy link
Contributor Author

md5 commented Feb 20, 2015

Thanks! I'll send through a separate PR tomorrow to complete the EOL for Jetty 7 and 8.

@tianon
Copy link
Member

tianon commented Feb 20, 2015 via email

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