From 519d54aea23dee5dc258f5cea9115e3b8bb2af16 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sun, 16 Nov 2025 12:09:35 +0800 Subject: [PATCH] test: add jetty ee11 Dockerfile --- .../docker-compose/jetty/Dockerfile-ee10 | 2 +- .../docker-compose/jetty/Dockerfile-ee11 | 7 +++++++ integration-test/docker-compose/jetty/Dockerfile-ee8 | 2 +- integration-test/docker-compose/jetty/Dockerfile-ee9 | 2 +- .../jetty/docker-compose-12-jre21-ee10.yaml | 2 +- .../jetty/docker-compose-12-jre21-ee11.yaml | 12 ++++++++++++ 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 integration-test/docker-compose/jetty/Dockerfile-ee11 create mode 100644 integration-test/docker-compose/jetty/docker-compose-12-jre21-ee11.yaml diff --git a/integration-test/docker-compose/jetty/Dockerfile-ee10 b/integration-test/docker-compose/jetty/Dockerfile-ee10 index d9aaf36c..05dc88b0 100644 --- a/integration-test/docker-compose/jetty/Dockerfile-ee10 +++ b/integration-test/docker-compose/jetty/Dockerfile-ee10 @@ -1,6 +1,6 @@ FROM jetty:12.0-jre21 -RUN java -jar /usr/local/jetty/start.jar --add-modules=ee10-deploy +RUN java -jar /usr/local/jetty/start.jar --add-modules=ee10-jsp,ee10-deploy EXPOSE 8080 diff --git a/integration-test/docker-compose/jetty/Dockerfile-ee11 b/integration-test/docker-compose/jetty/Dockerfile-ee11 new file mode 100644 index 00000000..edf74011 --- /dev/null +++ b/integration-test/docker-compose/jetty/Dockerfile-ee11 @@ -0,0 +1,7 @@ +FROM jetty:12.1-jdk21 + +RUN java -jar /usr/local/jetty/start.jar --add-modules=ee11-jsp,ee11-deploy + +EXPOSE 8080 + +CMD ["java", "-jar", "/usr/local/jetty/start.jar"] \ No newline at end of file diff --git a/integration-test/docker-compose/jetty/Dockerfile-ee8 b/integration-test/docker-compose/jetty/Dockerfile-ee8 index e9b2dbb4..c5fe6578 100644 --- a/integration-test/docker-compose/jetty/Dockerfile-ee8 +++ b/integration-test/docker-compose/jetty/Dockerfile-ee8 @@ -1,6 +1,6 @@ FROM jetty:12.0-jre21 -RUN java -jar /usr/local/jetty/start.jar --add-modules=ee8-deploy +RUN java -jar /usr/local/jetty/start.jar --add-modules=ee8-jsp,ee8-deploy EXPOSE 8080 diff --git a/integration-test/docker-compose/jetty/Dockerfile-ee9 b/integration-test/docker-compose/jetty/Dockerfile-ee9 index 6a107226..94a79bc7 100644 --- a/integration-test/docker-compose/jetty/Dockerfile-ee9 +++ b/integration-test/docker-compose/jetty/Dockerfile-ee9 @@ -1,6 +1,6 @@ FROM jetty:12.0-jre21 -RUN java -jar /usr/local/jetty/start.jar --add-modules=ee9-deploy +RUN java -jar /usr/local/jetty/start.jar --add-modules=ee9-jsp,ee9-deploy EXPOSE 8080 diff --git a/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee10.yaml b/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee10.yaml index c6dc2b07..c6c74a83 100644 --- a/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee10.yaml +++ b/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee10.yaml @@ -7,6 +7,6 @@ services: - "8080:8080" - "5005:5005" environment: - JAVA_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 + JAVA_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 volumes: - ../../../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war:/var/lib/jetty/webapps/app.war \ No newline at end of file diff --git a/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee11.yaml b/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee11.yaml new file mode 100644 index 00000000..3aab6b6f --- /dev/null +++ b/integration-test/docker-compose/jetty/docker-compose-12-jre21-ee11.yaml @@ -0,0 +1,12 @@ +services: + jetty1221ee11: + build: + dockerfile: ./Dockerfile-ee11 + context: . + ports: + - "8080:8080" + - "5005:5005" + environment: + JAVA_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 + volumes: + - ../../../vul/vul-webapp-jakarta/build/libs/vul-webapp-jakarta.war:/var/lib/jetty/webapps/app.war \ No newline at end of file