From 220cd7c0c6c1f2268f92a9c5a30340368f3e3e07 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 22 Aug 2023 15:10:13 +1000
Subject: [PATCH 1/2] Revert "eval then exec terminating commands in
 docker-entrypoint.sh"

This reverts commit bdc16a3a8305b98ea8aa2ffb997e94a656d4be1a.
---
 docker-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/docker-entrypoint.sh
+++ b/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
 

From 0cc0c51a10e6d7b99ae0593c27d4f79304a5d948 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 22 Aug 2023 15:10:45 +1000
Subject: [PATCH 2/2] update all docker-entrypoint.sh files

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh    | 3 ++-
 amazoncorretto/10.0/jdk11/docker-entrypoint.sh           | 3 ++-
 amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh    | 3 ++-
 amazoncorretto/10.0/jdk17/docker-entrypoint.sh           | 3 ++-
 amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh    | 3 ++-
 amazoncorretto/11.0/jdk11/docker-entrypoint.sh           | 3 ++-
 amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh    | 3 ++-
 amazoncorretto/11.0/jdk17/docker-entrypoint.sh           | 3 ++-
 amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh    | 3 ++-
 amazoncorretto/12.0/jdk17/docker-entrypoint.sh           | 3 ++-
 amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh     | 3 ++-
 amazoncorretto/9.4/jdk11/docker-entrypoint.sh            | 3 ++-
 amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh     | 3 ++-
 amazoncorretto/9.4/jdk17/docker-entrypoint.sh            | 3 ++-
 amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh      | 3 ++-
 amazoncorretto/9.4/jdk8/docker-entrypoint.sh             | 3 ++-
 azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh | 3 ++-
 azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh | 3 ++-
 azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh | 3 ++-
 azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh | 3 ++-
 azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh | 3 ++-
 azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh  | 3 ++-
 azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh  | 3 ++-
 azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh   | 3 ++-
 azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh        | 3 ++-
 azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh        | 3 ++-
 azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh        | 3 ++-
 azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh        | 3 ++-
 azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh        | 3 ++-
 azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh         | 3 ++-
 azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh         | 3 ++-
 azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/10.0/jdk11/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/10.0/jdk17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/10.0/jre11/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/10.0/jre17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/11.0/jdk11/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/11.0/jdk17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/11.0/jre11/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/11.0/jre17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/12.0/jdk17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh   | 3 ++-
 eclipse-temurin/12.0/jre17/docker-entrypoint.sh          | 3 ++-
 eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh    | 3 ++-
 eclipse-temurin/9.4/jdk11/docker-entrypoint.sh           | 3 ++-
 eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh    | 3 ++-
 eclipse-temurin/9.4/jdk17/docker-entrypoint.sh           | 3 ++-
 eclipse-temurin/9.4/jdk8/docker-entrypoint.sh            | 3 ++-
 eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh    | 3 ++-
 eclipse-temurin/9.4/jre11/docker-entrypoint.sh           | 3 ++-
 eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh    | 3 ++-
 eclipse-temurin/9.4/jre17/docker-entrypoint.sh           | 3 ++-
 eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh     | 3 ++-
 eclipse-temurin/9.4/jre8/docker-entrypoint.sh            | 3 ++-
 63 files changed, 126 insertions(+), 63 deletions(-)

diff --git a/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk11-alpine/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/amazoncorretto/10.0/jdk11/docker-entrypoint.sh b/amazoncorretto/10.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/10.0/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk11/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/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk17-alpine/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/amazoncorretto/10.0/jdk17/docker-entrypoint.sh b/amazoncorretto/10.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/10.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/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
 
diff --git a/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk11-alpine/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/amazoncorretto/11.0/jdk11/docker-entrypoint.sh b/amazoncorretto/11.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/11.0/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk11/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/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk17-alpine/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/amazoncorretto/11.0/jdk17/docker-entrypoint.sh b/amazoncorretto/11.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/11.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/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
 
diff --git a/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/12.0/jdk17-alpine/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/amazoncorretto/12.0/jdk17/docker-entrypoint.sh b/amazoncorretto/12.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/12.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/12.0/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
 
diff --git a/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk11-alpine/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/amazoncorretto/9.4/jdk11/docker-entrypoint.sh b/amazoncorretto/9.4/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk11/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/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk17-alpine/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/amazoncorretto/9.4/jdk17/docker-entrypoint.sh b/amazoncorretto/9.4/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/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
 
diff --git a/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk8-alpine/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/amazoncorretto/9.4/jdk8/docker-entrypoint.sh b/amazoncorretto/9.4/jdk8/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/amazoncorretto/9.4/jdk8/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk8/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/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/10.0/jdk11/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/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/10.0/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
 
diff --git a/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/11.0/jdk11/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/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/11.0/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
 
diff --git a/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/12.0/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
 
diff --git a/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/jdk11/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/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/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
 
diff --git a/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/jdk8/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/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/10.0/jdk11/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/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/10.0/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
 
diff --git a/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/11.0/jdk11/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/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/11.0/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
 
diff --git a/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/12.0/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
 
diff --git a/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/jdk11/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/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/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
 
diff --git a/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/jdk8/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/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk11-alpine/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/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk11/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/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk17-alpine/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/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/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
 
diff --git a/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre11-alpine/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/eclipse-temurin/10.0/jre11/docker-entrypoint.sh b/eclipse-temurin/10.0/jre11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre11/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/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre17-alpine/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/eclipse-temurin/10.0/jre17/docker-entrypoint.sh b/eclipse-temurin/10.0/jre17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/10.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre17/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/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk11-alpine/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/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk11/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/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk17-alpine/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/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/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
 
diff --git a/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre11-alpine/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/eclipse-temurin/11.0/jre11/docker-entrypoint.sh b/eclipse-temurin/11.0/jre11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre11/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/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre17-alpine/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/eclipse-temurin/11.0/jre17/docker-entrypoint.sh b/eclipse-temurin/11.0/jre17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/11.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre17/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/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jdk17-alpine/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/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/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
 
diff --git a/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jre17-alpine/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/eclipse-temurin/12.0/jre17/docker-entrypoint.sh b/eclipse-temurin/12.0/jre17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/12.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jre17/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/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk11-alpine/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/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk11/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/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk17-alpine/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/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/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
 
diff --git a/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk8/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/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre11-alpine/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/eclipse-temurin/9.4/jre11/docker-entrypoint.sh b/eclipse-temurin/9.4/jre11/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre11/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/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre17-alpine/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/eclipse-temurin/9.4/jre17/docker-entrypoint.sh b/eclipse-temurin/9.4/jre17/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre17/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/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre8-alpine/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/eclipse-temurin/9.4/jre8/docker-entrypoint.sh b/eclipse-temurin/9.4/jre8/docker-entrypoint.sh
index e90afb9f..48830eef 100755
--- a/eclipse-temurin/9.4/jre8/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre8/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