fix arguments for terminating commands in Jetty

[lachlan-roberts]

Fix issue with docker-entrypoint.sh which causes issues during startup for several users.

See jetty/jetty.docker#153

[github-actions]

Diff for f9a7a2e:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0293a3f..c42f832 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,212 +3,212 @@ GitRepo: https://github.com/eclipse/jetty.docker.git
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jdk8
 
 Tags: 9.4.51-jdk8-alpine-amazoncorretto, 9.4-jdk8-alpine-amazoncorretto, 9-jdk8-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk8-alpine
 
 Tags: 9.4.51-jdk8-amazoncorretto, 9.4-jdk8-amazoncorretto, 9-jdk8-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk8
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jdk11-alpine
 
 Tags: 9.4.51-jdk11-alpine-amazoncorretto, 9.4-jdk11-alpine-amazoncorretto, 9-jdk11-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk11-alpine
 
 Tags: 9.4.51-jdk11-amazoncorretto, 9.4-jdk11-amazoncorretto, 9-jdk11-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jdk17-alpine
 
 Tags: 9.4.51-jdk17-alpine-amazoncorretto, 9.4-jdk17-alpine-amazoncorretto, 9-jdk17-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/9.4/jdk17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre8
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre8-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre11-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/9.4/jre17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/10.0/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jdk11-alpine
 
 Tags: 10.0.15-jdk11-alpine-amazoncorretto, 10.0-jdk11-alpine-amazoncorretto, 10-jdk11-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/10.0/jdk11-alpine
 
 Tags: 10.0.15-jdk11-amazoncorretto, 10.0-jdk11-amazoncorretto, 10-jdk11-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/10.0/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jdk17-alpine
 
 Tags: 10.0.15-jdk17-alpine-amazoncorretto, 10.0-jdk17-alpine-amazoncorretto, 10-jdk17-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/10.0/jdk17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jre11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jre11-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jre17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/10.0/jre17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/11.0/jdk17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jdk11-alpine
 
 Tags: 11.0.15-jdk11-alpine-amazoncorretto, 11.0-jdk11-alpine-amazoncorretto, 11-jdk11-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/11.0/jdk11-alpine
 
 Tags: 11.0.15-jdk11-amazoncorretto, 11.0-jdk11-amazoncorretto, 11-jdk11-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/11.0/jdk11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jdk17-alpine
 
 Tags: 11.0.15-jdk17-alpine-amazoncorretto, 11.0-jdk17-alpine-amazoncorretto, 11-jdk17-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/11.0/jdk17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jre11
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jre11-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jre17
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/11.0/jre17-alpine
 
 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
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/12.0/jdk17
 
 Tags: 12.0.0-amazoncorretto, 12.0-amazoncorretto, 12.0.0-jdk17-amazoncorretto, 12.0-jdk17-amazoncorretto
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/12.0/jdk17
 
 Tags: 12.0.0-jdk17-alpine, 12.0-jdk17-alpine, 12.0.0-jdk17-alpine-eclipse-temurin, 12.0-jdk17-alpine-eclipse-temurin
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/12.0/jdk17-alpine
 
 Tags: 12.0.0-jdk17-alpine-amazoncorretto, 12.0-jdk17-alpine-amazoncorretto
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: amazoncorretto/12.0/jdk17-alpine
 
 Tags: 12.0.0-jre17, 12.0-jre17, 12.0.0-jre17-eclipse-temurin, 12.0-jre17-eclipse-temurin
 Architectures: amd64, arm64v8
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/12.0/jre17
 
 Tags: 12.0.0-jre17-alpine, 12.0-jre17-alpine, 12.0.0-jre17-alpine-eclipse-temurin, 12.0-jre17-alpine-eclipse-temurin
-GitCommit: 03c0b9d1d494f6f8b39f1e2046e680f2d3dd2604
+GitCommit: 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948
 Directory: eclipse-temurin/12.0/jre17-alpine
diff --git a/jetty_10-jdk11-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_10-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_10-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk11-amazoncorretto/docker-entrypoint.sh b/jetty_10-jdk11-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk11-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_10-jdk11-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk11-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jdk11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jdk11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk17-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_10-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_10-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk17-amazoncorretto/docker-entrypoint.sh b/jetty_10-jdk17-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk17-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_10-jdk17-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jdk17-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jdk17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jdk17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jdk17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jre11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jre11-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jre11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jre11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jre11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jre17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_10-jre17-eclipse-temurin/docker-entrypoint.sh b/jetty_10-jre17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_10-jre17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_10-jre17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk11-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_11-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_11-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk11-amazoncorretto/docker-entrypoint.sh b/jetty_11-jdk11-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk11-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_11-jdk11-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk11-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jdk11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jdk11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk17-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_11-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_11-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jdk17-amazoncorretto/docker-entrypoint.sh b/jetty_11-jdk17-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jdk17-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_11-jdk17-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jre11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jre11-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jre11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jre11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jre11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jre17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_11-jre17-eclipse-temurin/docker-entrypoint.sh b/jetty_11-jre17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_11-jre17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_11-jre17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jdk17-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_12.0-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_12.0-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_12.0-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_12.0-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jdk17-amazoncorretto/docker-entrypoint.sh b/jetty_12.0-jdk17-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jdk17-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_12.0-jdk17-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jdk17-eclipse-temurin/docker-entrypoint.sh b/jetty_12.0-jdk17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jdk17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_12.0-jdk17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jre17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_12.0-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_12.0-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_12.0-jre17-eclipse-temurin/docker-entrypoint.sh b/jetty_12.0-jre17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_12.0-jre17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_12.0-jre17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk11-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk11-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jdk11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk11-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk11-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk11-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk11-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk11-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jdk11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jdk11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk17-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk17-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jdk17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk17-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk17-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk17-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk17-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk17-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jdk17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jdk17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk8-alpine-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk8-alpine-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk8-alpine-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk8-alpine-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk8-amazoncorretto/docker-entrypoint.sh b/jetty_9-jdk8-amazoncorretto/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk8-amazoncorretto/docker-entrypoint.sh
+++ b/jetty_9-jdk8-amazoncorretto/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jdk8-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jdk8-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jdk8-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jdk8-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre11-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre11-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre11-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre11-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre11-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre11-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre17-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre17-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre17-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre17-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre17-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre17-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre8-alpine-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre8-alpine-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre8-alpine-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre8-alpine-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_9-jre8-eclipse-temurin/docker-entrypoint.sh b/jetty_9-jre8-eclipse-temurin/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_9-jre8-eclipse-temurin/docker-entrypoint.sh
+++ b/jetty_9-jre8-eclipse-temurin/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done
 
diff --git a/jetty_jdk17/docker-entrypoint.sh b/jetty_jdk17/docker-entrypoint.sh
index e90afb9..48830ee 100755
--- a/jetty_jdk17/docker-entrypoint.sh
+++ b/jetty_jdk17/docker-entrypoint.sh
@@ -63,7 +63,8 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
+			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
+			. $JETTY_BASE/jetty.exec
 		esac
 	done

Relevant Maintainers:

• jetty: @gregw @lachlan-roberts @olamy @joakime

[yosifkit]

Won't this just surface another issue with a different set of users? i.e. the quoting of "$@" getting lost when run through echo. Perhaps reverting back to the exec from the official images PR before the last (#14615)?

exec $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES

(Edit to point to the correct PR)

[lachlan-roberts]

Closing this for now. I am going to focus on getting proper tests for all the use cases we want to support before making any further changes to this.