From debff9b64588a3ec1443af73fb0c5e504ec0e2ab Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Aug 2023 11:10:37 +1000 Subject: [PATCH 1/4] Add images for Jetty 12.0 Signed-off-by: Lachlan Roberts --- library/jetty | 112 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 41 deletions(-) diff --git a/library/jetty b/library/jetty index b5656501ef0a4..069327ee502ea 100644 --- a/library/jetty +++ b/library/jetty @@ -7,204 +7,234 @@ GitRepo: https://github.com/eclipse/jetty.docker.git Tags: 9.4.51-jre8-alpine, 9.4-jre8-alpine, 9-jre8-alpine, 9.4.51-jre8-alpine-eclipse-temurin, 9.4-jre8-alpine-eclipse-temurin, 9-jre8-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre8-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jre8, 9.4-jre8, 9-jre8, 9.4.51-jre8-eclipse-temurin, 9.4-jre8-eclipse-temurin, 9-jre8-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre8 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jre17-alpine, 9.4-jre17-alpine, 9-jre17-alpine, 9.4.51-jre17-alpine-eclipse-temurin, 9.4-jre17-alpine-eclipse-temurin, 9-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jre17, 9.4-jre17, 9-jre17, 9.4.51-jre17-eclipse-temurin, 9.4-jre17-eclipse-temurin, 9-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jre11-alpine, 9.4-jre11-alpine, 9-jre11-alpine, 9.4.51-jre11-alpine-eclipse-temurin, 9.4-jre11-alpine-eclipse-temurin, 9-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jre11, 9.4-jre11, 9-jre11, 9.4.51-jre11-eclipse-temurin, 9.4-jre11-eclipse-temurin, 9-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk8, 9.4-jdk8, 9-jdk8, 9.4.51-jdk8-eclipse-temurin, 9.4-jdk8-eclipse-temurin, 9-jdk8-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk8 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk17-alpine, 9.4-jdk17-alpine, 9-jdk17-alpine, 9.4.51-jdk17-alpine-eclipse-temurin, 9.4-jdk17-alpine-eclipse-temurin, 9-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51, 9.4, 9, 9.4.51-jdk17, 9.4-jdk17, 9-jdk17, 9.4.51-eclipse-temurin, 9.4-eclipse-temurin, 9-eclipse-temurin, 9.4.51-jdk17-eclipse-temurin, 9.4-jdk17-eclipse-temurin, 9-jdk17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk11-alpine, 9.4-jdk11-alpine, 9-jdk11-alpine, 9.4.51-jdk11-alpine-eclipse-temurin, 9.4-jdk11-alpine-eclipse-temurin, 9-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk11, 9.4-jdk11, 9-jdk11, 9.4.51-jdk11-eclipse-temurin, 9.4-jdk11-eclipse-temurin, 9-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0-jre17-alpine, 12.0-jre17-alpine, 12.0.0-jre17-alpine-eclipse-temurin, 12.0-jre17-alpine-eclipse-temurin +Architectures: amd64 +Directory: eclipse-temurin/12.0/jre17-alpine +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0-jre17, 12.0-jre17, 12.0.0-jre17-eclipse-temurin, 12.0-jre17-eclipse-temurin +Architectures: amd64, arm64v8 +Directory: eclipse-temurin/12.0/jre17 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0-jdk17-alpine, 12.0-jdk17-alpine, 12.0.0-jdk17-alpine-eclipse-temurin, 12.0-jdk17-alpine-eclipse-temurin +Architectures: amd64 +Directory: eclipse-temurin/12.0/jdk17-alpine +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0, 12.0, 12.0.0-jdk17, 12.0-jdk17, 12.0.0-eclipse-temurin, 12.0-eclipse-temurin, 12.0.0-jdk17-eclipse-temurin, 12.0-jdk17-eclipse-temurin +Architectures: amd64, arm64v8 +Directory: eclipse-temurin/12.0/jdk17 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jre17-alpine, 11.0-jre17-alpine, 11-jre17-alpine, 11.0.15-jre17-alpine-eclipse-temurin, 11.0-jre17-alpine-eclipse-temurin, 11-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jre17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jre17, 11.0-jre17, 11-jre17, 11.0.15-jre17-eclipse-temurin, 11.0-jre17-eclipse-temurin, 11-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jre17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jre11-alpine, 11.0-jre11-alpine, 11-jre11-alpine, 11.0.15-jre11-alpine-eclipse-temurin, 11.0-jre11-alpine-eclipse-temurin, 11-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jre11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jre11, 11.0-jre11, 11-jre11, 11.0.15-jre11-eclipse-temurin, 11.0-jre11-eclipse-temurin, 11-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jre11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk17-alpine, 11.0-jdk17-alpine, 11-jdk17-alpine, 11.0.15-jdk17-alpine-eclipse-temurin, 11.0-jdk17-alpine-eclipse-temurin, 11-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15, 11.0, 11, 11.0.15-jdk17, 11.0-jdk17, 11-jdk17, 11.0.15-eclipse-temurin, 11.0-eclipse-temurin, 11-eclipse-temurin, 11.0.15-jdk17-eclipse-temurin, 11.0-jdk17-eclipse-temurin, 11-jdk17-eclipse-temurin, latest, jdk17 Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk11-alpine, 11.0-jdk11-alpine, 11-jdk11-alpine, 11.0.15-jdk11-alpine-eclipse-temurin, 11.0-jdk11-alpine-eclipse-temurin, 11-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk11, 11.0-jdk11, 11-jdk11, 11.0.15-jdk11-eclipse-temurin, 11.0-jdk11-eclipse-temurin, 11-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jre17-alpine, 10.0-jre17-alpine, 10-jre17-alpine, 10.0.15-jre17-alpine-eclipse-temurin, 10.0-jre17-alpine-eclipse-temurin, 10-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jre17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jre17, 10.0-jre17, 10-jre17, 10.0.15-jre17-eclipse-temurin, 10.0-jre17-eclipse-temurin, 10-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jre17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jre11-alpine, 10.0-jre11-alpine, 10-jre11-alpine, 10.0.15-jre11-alpine-eclipse-temurin, 10.0-jre11-alpine-eclipse-temurin, 10-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jre11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jre11, 10.0-jre11, 10-jre11, 10.0.15-jre11-eclipse-temurin, 10.0-jre11-eclipse-temurin, 10-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jre11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk17-alpine, 10.0-jdk17-alpine, 10-jdk17-alpine, 10.0.15-jdk17-alpine-eclipse-temurin, 10.0-jdk17-alpine-eclipse-temurin, 10-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15, 10.0, 10, 10.0.15-jdk17, 10.0-jdk17, 10-jdk17, 10.0.15-eclipse-temurin, 10.0-eclipse-temurin, 10-eclipse-temurin, 10.0.15-jdk17-eclipse-temurin, 10.0-jdk17-eclipse-temurin, 10-jdk17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk11-alpine, 10.0-jdk11-alpine, 10-jdk11-alpine, 10.0.15-jdk11-alpine-eclipse-temurin, 10.0-jdk11-alpine-eclipse-temurin, 10-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk11, 10.0-jdk11, 10-jdk11, 10.0.15-jdk11-eclipse-temurin, 10.0-jdk11-eclipse-temurin, 10-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk8-alpine-amazoncorretto, 9.4-jdk8-alpine-amazoncorretto, 9-jdk8-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk8-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk8-amazoncorretto, 9.4-jdk8-amazoncorretto, 9-jdk8-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk8 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk17-alpine-amazoncorretto, 9.4-jdk17-alpine-amazoncorretto, 9-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-amazoncorretto, 9.4-amazoncorretto, 9-amazoncorretto, 9.4.51-jdk17-amazoncorretto, 9.4-jdk17-amazoncorretto, 9-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk11-alpine-amazoncorretto, 9.4-jdk11-alpine-amazoncorretto, 9-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 9.4.51-jdk11-amazoncorretto, 9.4-jdk11-amazoncorretto, 9-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0-jdk17-alpine-amazoncorretto, 12.0-jdk17-alpine-amazoncorretto +Architectures: amd64 +Directory: amazoncorretto/12.0/jdk17-alpine +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 + +Tags: 12.0.0-amazoncorretto, 12.0-amazoncorretto, 12.0.0-jdk17-amazoncorretto, 12.0-jdk17-amazoncorretto +Architectures: amd64, arm64v8 +Directory: amazoncorretto/12.0/jdk17 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk17-alpine-amazoncorretto, 11.0-jdk17-alpine-amazoncorretto, 11-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/11.0/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-amazoncorretto, 11.0-amazoncorretto, 11-amazoncorretto, 11.0.15-jdk17-amazoncorretto, 11.0-jdk17-amazoncorretto, 11-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/11.0/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk11-alpine-amazoncorretto, 11.0-jdk11-alpine-amazoncorretto, 11-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/11.0/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 11.0.15-jdk11-amazoncorretto, 11.0-jdk11-amazoncorretto, 11-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/11.0/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk17-alpine-amazoncorretto, 10.0-jdk17-alpine-amazoncorretto, 10-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/10.0/jdk17-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-amazoncorretto, 10.0-amazoncorretto, 10-amazoncorretto, 10.0.15-jdk17-amazoncorretto, 10.0-jdk17-amazoncorretto, 10-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/10.0/jdk17 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk11-alpine-amazoncorretto, 10.0-jdk11-alpine-amazoncorretto, 10-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/10.0/jdk11-alpine -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 Tags: 10.0.15-jdk11-amazoncorretto, 10.0-jdk11-amazoncorretto, 10-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/10.0/jdk11 -GitCommit: a64cb1a45b90d5fc026a6356615c2ac53d991ed1 +GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 From 83770657f885f444665e6f07f6cc2ff0038425c6 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Aug 2023 13:52:52 +1000 Subject: [PATCH 2/4] attempt to fix tests for jetty 12 images Signed-off-by: Lachlan Roberts --- test/tests/jetty-hello-web/run.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/tests/jetty-hello-web/run.sh b/test/tests/jetty-hello-web/run.sh index a64f8218175db..3a79f34f70476 100755 --- a/test/tests/jetty-hello-web/run.sh +++ b/test/tests/jetty-hello-web/run.sh @@ -21,7 +21,11 @@ serverImage="$("$dir/../image-name.sh" librarytest/jetty-hello-web "$image")" FROM $image COPY dir/index.jsp /var/lib/jetty/webapps/ROOT/ EOD -cid="$(docker run -d "$serverImage")" + +if [[ $image == *"12."* ]]; then + CMD="sh -c \"java -jar $JETTY_HOME/start.jar --add-to-start=ee10-deploy,ee10-jsp ; /docker-entrypoint.sh\"" ; +fi +cid="$(docker run -d "$serverImage" "$CMD")" trap "docker rm -vf $cid > /dev/null" EXIT _request() { From e9124b62567c0f18f105c405dda75897bd01bc30 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 8 Aug 2023 14:15:52 +1000 Subject: [PATCH 3/4] attempt to fix tests for jetty 12 images Signed-off-by: Lachlan Roberts --- test/tests/jetty-hello-web/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/tests/jetty-hello-web/run.sh b/test/tests/jetty-hello-web/run.sh index 3a79f34f70476..f0ce8ac06869b 100755 --- a/test/tests/jetty-hello-web/run.sh +++ b/test/tests/jetty-hello-web/run.sh @@ -23,9 +23,10 @@ COPY dir/index.jsp /var/lib/jetty/webapps/ROOT/ EOD if [[ $image == *"12."* ]]; then - CMD="sh -c \"java -jar $JETTY_HOME/start.jar --add-to-start=ee10-deploy,ee10-jsp ; /docker-entrypoint.sh\"" ; + cid="$(docker run -d "$serverImage" sh -c 'java -jar $JETTY_HOME/start.jar --add-to-start=ee10-deploy,ee10-jsp ; /docker-entrypoint.sh')" +else + cid="$(docker run -d "$serverImage")" fi -cid="$(docker run -d "$serverImage" "$CMD")" trap "docker rm -vf $cid > /dev/null" EXIT _request() { From 3de355404045244b7a521dcd41b65bc4311e2a7a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 15 Aug 2023 18:53:53 +1000 Subject: [PATCH 4/4] changes from review Signed-off-by: Lachlan Roberts --- library/jetty | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/library/jetty b/library/jetty index 069327ee502ea..c50c0f3b04e7e 100644 --- a/library/jetty +++ b/library/jetty @@ -7,234 +7,234 @@ GitRepo: https://github.com/eclipse/jetty.docker.git Tags: 9.4.51-jre8-alpine, 9.4-jre8-alpine, 9-jre8-alpine, 9.4.51-jre8-alpine-eclipse-temurin, 9.4-jre8-alpine-eclipse-temurin, 9-jre8-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre8-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jre8, 9.4-jre8, 9-jre8, 9.4.51-jre8-eclipse-temurin, 9.4-jre8-eclipse-temurin, 9-jre8-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre8 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jre17-alpine, 9.4-jre17-alpine, 9-jre17-alpine, 9.4.51-jre17-alpine-eclipse-temurin, 9.4-jre17-alpine-eclipse-temurin, 9-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jre17, 9.4-jre17, 9-jre17, 9.4.51-jre17-eclipse-temurin, 9.4-jre17-eclipse-temurin, 9-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jre11-alpine, 9.4-jre11-alpine, 9-jre11-alpine, 9.4.51-jre11-alpine-eclipse-temurin, 9.4-jre11-alpine-eclipse-temurin, 9-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jre11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jre11, 9.4-jre11, 9-jre11, 9.4.51-jre11-eclipse-temurin, 9.4-jre11-eclipse-temurin, 9-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jre11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk8, 9.4-jdk8, 9-jdk8, 9.4.51-jdk8-eclipse-temurin, 9.4-jdk8-eclipse-temurin, 9-jdk8-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk8 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk17-alpine, 9.4-jdk17-alpine, 9-jdk17-alpine, 9.4.51-jdk17-alpine-eclipse-temurin, 9.4-jdk17-alpine-eclipse-temurin, 9-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51, 9.4, 9, 9.4.51-jdk17, 9.4-jdk17, 9-jdk17, 9.4.51-eclipse-temurin, 9.4-eclipse-temurin, 9-eclipse-temurin, 9.4.51-jdk17-eclipse-temurin, 9.4-jdk17-eclipse-temurin, 9-jdk17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk11-alpine, 9.4-jdk11-alpine, 9-jdk11-alpine, 9.4.51-jdk11-alpine-eclipse-temurin, 9.4-jdk11-alpine-eclipse-temurin, 9-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/9.4/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk11, 9.4-jdk11, 9-jdk11, 9.4.51-jdk11-eclipse-temurin, 9.4-jdk11-eclipse-temurin, 9-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/9.4/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0-jre17-alpine, 12.0-jre17-alpine, 12.0.0-jre17-alpine-eclipse-temurin, 12.0-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/12.0/jre17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0-jre17, 12.0-jre17, 12.0.0-jre17-eclipse-temurin, 12.0-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/12.0/jre17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0-jdk17-alpine, 12.0-jdk17-alpine, 12.0.0-jdk17-alpine-eclipse-temurin, 12.0-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/12.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0, 12.0, 12.0.0-jdk17, 12.0-jdk17, 12.0.0-eclipse-temurin, 12.0-eclipse-temurin, 12.0.0-jdk17-eclipse-temurin, 12.0-jdk17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/12.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jre17-alpine, 11.0-jre17-alpine, 11-jre17-alpine, 11.0.15-jre17-alpine-eclipse-temurin, 11.0-jre17-alpine-eclipse-temurin, 11-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jre17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jre17, 11.0-jre17, 11-jre17, 11.0.15-jre17-eclipse-temurin, 11.0-jre17-eclipse-temurin, 11-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jre17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jre11-alpine, 11.0-jre11-alpine, 11-jre11-alpine, 11.0.15-jre11-alpine-eclipse-temurin, 11.0-jre11-alpine-eclipse-temurin, 11-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jre11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jre11, 11.0-jre11, 11-jre11, 11.0.15-jre11-eclipse-temurin, 11.0-jre11-eclipse-temurin, 11-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jre11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk17-alpine, 11.0-jdk17-alpine, 11-jdk17-alpine, 11.0.15-jdk17-alpine-eclipse-temurin, 11.0-jdk17-alpine-eclipse-temurin, 11-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15, 11.0, 11, 11.0.15-jdk17, 11.0-jdk17, 11-jdk17, 11.0.15-eclipse-temurin, 11.0-eclipse-temurin, 11-eclipse-temurin, 11.0.15-jdk17-eclipse-temurin, 11.0-jdk17-eclipse-temurin, 11-jdk17-eclipse-temurin, latest, jdk17 Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk11-alpine, 11.0-jdk11-alpine, 11-jdk11-alpine, 11.0.15-jdk11-alpine-eclipse-temurin, 11.0-jdk11-alpine-eclipse-temurin, 11-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/11.0/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk11, 11.0-jdk11, 11-jdk11, 11.0.15-jdk11-eclipse-temurin, 11.0-jdk11-eclipse-temurin, 11-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/11.0/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jre17-alpine, 10.0-jre17-alpine, 10-jre17-alpine, 10.0.15-jre17-alpine-eclipse-temurin, 10.0-jre17-alpine-eclipse-temurin, 10-jre17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jre17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jre17, 10.0-jre17, 10-jre17, 10.0.15-jre17-eclipse-temurin, 10.0-jre17-eclipse-temurin, 10-jre17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jre17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jre11-alpine, 10.0-jre11-alpine, 10-jre11-alpine, 10.0.15-jre11-alpine-eclipse-temurin, 10.0-jre11-alpine-eclipse-temurin, 10-jre11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jre11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jre11, 10.0-jre11, 10-jre11, 10.0.15-jre11-eclipse-temurin, 10.0-jre11-eclipse-temurin, 10-jre11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jre11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk17-alpine, 10.0-jdk17-alpine, 10-jdk17-alpine, 10.0.15-jdk17-alpine-eclipse-temurin, 10.0-jdk17-alpine-eclipse-temurin, 10-jdk17-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15, 10.0, 10, 10.0.15-jdk17, 10.0-jdk17, 10-jdk17, 10.0.15-eclipse-temurin, 10.0-eclipse-temurin, 10-eclipse-temurin, 10.0.15-jdk17-eclipse-temurin, 10.0-jdk17-eclipse-temurin, 10-jdk17-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk11-alpine, 10.0-jdk11-alpine, 10-jdk11-alpine, 10.0.15-jdk11-alpine-eclipse-temurin, 10.0-jdk11-alpine-eclipse-temurin, 10-jdk11-alpine-eclipse-temurin Architectures: amd64 Directory: eclipse-temurin/10.0/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk11, 10.0-jdk11, 10-jdk11, 10.0.15-jdk11-eclipse-temurin, 10.0-jdk11-eclipse-temurin, 10-jdk11-eclipse-temurin Architectures: amd64, arm64v8 Directory: eclipse-temurin/10.0/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk8-alpine-amazoncorretto, 9.4-jdk8-alpine-amazoncorretto, 9-jdk8-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk8-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk8-amazoncorretto, 9.4-jdk8-amazoncorretto, 9-jdk8-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk8 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk17-alpine-amazoncorretto, 9.4-jdk17-alpine-amazoncorretto, 9-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-amazoncorretto, 9.4-amazoncorretto, 9-amazoncorretto, 9.4.51-jdk17-amazoncorretto, 9.4-jdk17-amazoncorretto, 9-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk11-alpine-amazoncorretto, 9.4-jdk11-alpine-amazoncorretto, 9-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/9.4/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 9.4.51-jdk11-amazoncorretto, 9.4-jdk11-amazoncorretto, 9-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/9.4/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0-jdk17-alpine-amazoncorretto, 12.0-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/12.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 12.0.0-amazoncorretto, 12.0-amazoncorretto, 12.0.0-jdk17-amazoncorretto, 12.0-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/12.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk17-alpine-amazoncorretto, 11.0-jdk17-alpine-amazoncorretto, 11-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/11.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-amazoncorretto, 11.0-amazoncorretto, 11-amazoncorretto, 11.0.15-jdk17-amazoncorretto, 11.0-jdk17-amazoncorretto, 11-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/11.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk11-alpine-amazoncorretto, 11.0-jdk11-alpine-amazoncorretto, 11-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/11.0/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 11.0.15-jdk11-amazoncorretto, 11.0-jdk11-amazoncorretto, 11-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/11.0/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk17-alpine-amazoncorretto, 10.0-jdk17-alpine-amazoncorretto, 10-jdk17-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/10.0/jdk17-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-amazoncorretto, 10.0-amazoncorretto, 10-amazoncorretto, 10.0.15-jdk17-amazoncorretto, 10.0-jdk17-amazoncorretto, 10-jdk17-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/10.0/jdk17 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk11-alpine-amazoncorretto, 10.0-jdk11-alpine-amazoncorretto, 10-jdk11-alpine-amazoncorretto Architectures: amd64 Directory: amazoncorretto/10.0/jdk11-alpine -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604 Tags: 10.0.15-jdk11-amazoncorretto, 10.0-jdk11-amazoncorretto, 10-jdk11-amazoncorretto Architectures: amd64, arm64v8 Directory: amazoncorretto/10.0/jdk11 -GitCommit: 5a0f1eb5bb291583fd37667ca3f8715ccbf28228 +GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604