From 62cd5da41b4c91930b92343c63ab049bcbcf764e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 14 Nov 2022 12:13:05 +1100 Subject: [PATCH 1/2] remove line in jetty docs about JDK9 and HTTP2 Signed-off-by: Lachlan Roberts --- jetty/README.md | 2 -- jetty/content.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/jetty/README.md b/jetty/README.md index f45eff76c220..bbf11f61f6b6 100644 --- a/jetty/README.md +++ b/jetty/README.md @@ -177,8 +177,6 @@ RUN java -jar $JETTY_HOME/start.jar --add-to-startd=http2 --approve-all-licenses This will add an `http2.ini` file to the `$JETTY_BASE/start.d` directory and download the required ALPN libraries into `$JETTY_BASE/lib/alpn`, allowing the use of HTTP/2. HTTP/2 connections should be made via the same port as normal HTTPS connections (container port 8443). If you would like to enable the `http2` module via `$JETTY_BASE/start.ini` instead, substitute `--add-to-start` in place of `--add-to-startd` in the `RUN` command above. -Once OpenJDK 9 becomes generally available with built-in support for ALPN, this image will be updated to enable HTTP/2 support by default. - # Security By default, this image starts as user `root` and uses Jetty's `setuid` module to drop privileges to user `jetty` after initialization. The `JETTY_BASE` directory at `/var/lib/jetty` is owned by `jetty:jetty` (uid 999, gid 999). diff --git a/jetty/content.md b/jetty/content.md index d9abb97624e0..ffadcc694576 100644 --- a/jetty/content.md +++ b/jetty/content.md @@ -90,8 +90,6 @@ RUN java -jar $JETTY_HOME/start.jar --add-to-startd=http2 --approve-all-licenses This will add an `http2.ini` file to the `$JETTY_BASE/start.d` directory and download the required ALPN libraries into `$JETTY_BASE/lib/alpn`, allowing the use of HTTP/2. HTTP/2 connections should be made via the same port as normal HTTPS connections (container port 8443). If you would like to enable the `http2` module via `$JETTY_BASE/start.ini` instead, substitute `--add-to-start` in place of `--add-to-startd` in the `RUN` command above. -Once OpenJDK 9 becomes generally available with built-in support for ALPN, this image will be updated to enable HTTP/2 support by default. - # Security By default, this image starts as user `root` and uses Jetty's `setuid` module to drop privileges to user `jetty` after initialization. The `JETTY_BASE` directory at `/var/lib/jetty` is owned by `jetty:jetty` (uid 999, gid 999). From 0ad3976a91d0f6cab1943d09af94105c5dcc72e3 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 14 Nov 2022 14:33:43 +1100 Subject: [PATCH 2/2] revert change to README.md Signed-off-by: Lachlan Roberts --- jetty/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jetty/README.md b/jetty/README.md index bbf11f61f6b6..f45eff76c220 100644 --- a/jetty/README.md +++ b/jetty/README.md @@ -177,6 +177,8 @@ RUN java -jar $JETTY_HOME/start.jar --add-to-startd=http2 --approve-all-licenses This will add an `http2.ini` file to the `$JETTY_BASE/start.d` directory and download the required ALPN libraries into `$JETTY_BASE/lib/alpn`, allowing the use of HTTP/2. HTTP/2 connections should be made via the same port as normal HTTPS connections (container port 8443). If you would like to enable the `http2` module via `$JETTY_BASE/start.ini` instead, substitute `--add-to-start` in place of `--add-to-startd` in the `RUN` command above. +Once OpenJDK 9 becomes generally available with built-in support for ALPN, this image will be updated to enable HTTP/2 support by default. + # Security By default, this image starts as user `root` and uses Jetty's `setuid` module to drop privileges to user `jetty` after initialization. The `JETTY_BASE` directory at `/var/lib/jetty` is owned by `jetty:jetty` (uid 999, gid 999).