From 1bacfe7bec81f1e261ede86f63d19dffd1c7512c Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Sun, 1 Oct 2017 18:28:26 +1100
Subject: [PATCH 1/4] Issue #80 generate-jetty-start.sh Permission denied

Moved the /jetty-start file to $JETTY_BASE/jetty.start, where it can be
written to by the jetty user.

Added a warning in the docker-entrypoint.sh if the user is not 'jetty'
---
 9.2-jre7/docker-entrypoint.sh           | 30 ++++++++++++++++---------
 9.2-jre7/generate-jetty-start.sh        |  5 +++--
 9.2-jre8/docker-entrypoint.sh           | 30 ++++++++++++++++---------
 9.2-jre8/generate-jetty-start.sh        |  5 +++--
 9.3-jre8/alpine/Dockerfile              |  2 +-
 9.3-jre8/alpine/docker-entrypoint.sh    | 30 ++++++++++++++++---------
 9.3-jre8/alpine/generate-jetty-start.sh |  5 +++--
 9.3-jre8/docker-entrypoint.sh           | 30 ++++++++++++++++---------
 9.3-jre8/generate-jetty-start.sh        |  5 +++--
 9.4-jre8/alpine/Dockerfile              |  2 +-
 9.4-jre8/alpine/docker-entrypoint.sh    | 30 ++++++++++++++++---------
 9.4-jre8/alpine/generate-jetty-start.sh |  5 +++--
 9.4-jre8/docker-entrypoint.sh           | 30 ++++++++++++++++---------
 9.4-jre8/generate-jetty-start.sh        |  5 +++--
 docker-entrypoint.sh                    | 30 ++++++++++++++++---------
 generate-jetty-start.sh                 |  5 +++--
 16 files changed, 163 insertions(+), 86 deletions(-)

diff --git a/9.2-jre7/docker-entrypoint.sh b/9.2-jre7/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.2-jre7/docker-entrypoint.sh
+++ b/9.2-jre7/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.2-jre7/generate-jetty-start.sh b/9.2-jre7/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.2-jre7/generate-jetty-start.sh
+++ b/9.2-jre7/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/9.2-jre8/docker-entrypoint.sh b/9.2-jre8/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.2-jre8/docker-entrypoint.sh
+++ b/9.2-jre8/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.2-jre8/generate-jetty-start.sh b/9.2-jre8/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.2-jre8/generate-jetty-start.sh
+++ b/9.2-jre8/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/9.3-jre8/alpine/Dockerfile b/9.3-jre8/alpine/Dockerfile
index 86d60f1..b1c62d9 100644
--- a/9.3-jre8/alpine/Dockerfile
+++ b/9.3-jre8/alpine/Dockerfile
@@ -72,7 +72,7 @@ RUN set -xe \
 	&& mkdir -p "$TMPDIR" \
 	&& chown -R jetty:jetty "$TMPDIR"
 
-COPY docker-entrypoint.sh /
+COPY docker-entrypoint.sh generate-jetty-start.sh /
 
 USER jetty
 EXPOSE 8080
diff --git a/9.3-jre8/alpine/docker-entrypoint.sh b/9.3-jre8/alpine/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.3-jre8/alpine/docker-entrypoint.sh
+++ b/9.3-jre8/alpine/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.3-jre8/alpine/generate-jetty-start.sh b/9.3-jre8/alpine/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.3-jre8/alpine/generate-jetty-start.sh
+++ b/9.3-jre8/alpine/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/9.3-jre8/docker-entrypoint.sh b/9.3-jre8/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.3-jre8/docker-entrypoint.sh
+++ b/9.3-jre8/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.3-jre8/generate-jetty-start.sh b/9.3-jre8/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.3-jre8/generate-jetty-start.sh
+++ b/9.3-jre8/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/9.4-jre8/alpine/Dockerfile b/9.4-jre8/alpine/Dockerfile
index 2548e30..54856d9 100644
--- a/9.4-jre8/alpine/Dockerfile
+++ b/9.4-jre8/alpine/Dockerfile
@@ -66,7 +66,7 @@ RUN set -xe \
 	&& mkdir -p "$TMPDIR" \
 	&& chown -R jetty:jetty "$TMPDIR"
 
-COPY docker-entrypoint.sh /
+COPY docker-entrypoint.sh generate-jetty-start.sh /
 
 USER jetty
 EXPOSE 8080
diff --git a/9.4-jre8/alpine/docker-entrypoint.sh b/9.4-jre8/alpine/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.4-jre8/alpine/docker-entrypoint.sh
+++ b/9.4-jre8/alpine/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.4-jre8/alpine/generate-jetty-start.sh b/9.4-jre8/alpine/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.4-jre8/alpine/generate-jetty-start.sh
+++ b/9.4-jre8/alpine/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/9.4-jre8/docker-entrypoint.sh b/9.4-jre8/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/9.4-jre8/docker-entrypoint.sh
+++ b/9.4-jre8/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/9.4-jre8/generate-jetty-start.sh b/9.4-jre8/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/9.4-jre8/generate-jetty-start.sh
+++ b/9.4-jre8/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 677c323..4adaaaa 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -62,30 +62,40 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		esac
 	done
 
-	if [ -f /jetty-start ] ; then
-		if [ $JETTY_BASE/start.d -nt /jetty-start ] ; then
+	if [ $(whoami) != "jetty" ]; then
+		cat >&2 <<- EOWARN
+			********************************************************************
+			WARNING: User is $(whoami)
+			         The user should be (re)set to 'jetty' in the Dockerfile
+			********************************************************************
+		EOWARN
+	fi
+
+	if [ -f $JETTY_BASE/jetty.start ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the /jetty-start files was generated. Please either delete 
-			         the /jetty-start file or re-run /generate-jetty-start.sh 
+			         the $JETTY_BASE/jetty.start files was generated. Either delete 
+			         the $JETTY_BASE/jetty.start file or re-run 
+				     /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from /jetty-start
-		set -- $(cat /jetty-start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
+		set -- $(cat $JETTY_BASE/jetty.start)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > /$TMPDIR/jetty-start
-		if [ $(egrep -v '\\$' $TMPDIR/jetty-start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_BASE/jetty.start
+		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $TMPDIR/jetty-start \
+			cat $JETTY_BASE/jetty.start \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $TMPDIR/jetty-start)
+		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
 	fi
 fi
 
diff --git a/generate-jetty-start.sh b/generate-jetty-start.sh
index 0dbaba7..0a7c12d 100755
--- a/generate-jetty-start.sh
+++ b/generate-jetty-start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-rm -f /jetty-start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > /jetty-start
+
+rm -f $JETTY_BASE/jetty.start
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start

From 4d6cb91984aa72934e2474918d8f1eeb6549fbdd Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 4 Oct 2017 18:15:02 +1100
Subject: [PATCH 2/4] created JETTY_START variable

---
 9.2-jre7/docker-entrypoint.sh           | 27 +++++++++++++++----------
 9.2-jre7/generate-jetty-start.sh        |  7 +++++--
 9.2-jre8/docker-entrypoint.sh           | 27 +++++++++++++++----------
 9.2-jre8/generate-jetty-start.sh        |  7 +++++--
 9.3-jre8/alpine/docker-entrypoint.sh    | 27 +++++++++++++++----------
 9.3-jre8/alpine/generate-jetty-start.sh |  7 +++++--
 9.3-jre8/docker-entrypoint.sh           | 27 +++++++++++++++----------
 9.3-jre8/generate-jetty-start.sh        |  7 +++++--
 9.4-jre8/alpine/docker-entrypoint.sh    | 27 +++++++++++++++----------
 9.4-jre8/alpine/generate-jetty-start.sh |  7 +++++--
 9.4-jre8/docker-entrypoint.sh           | 27 +++++++++++++++----------
 9.4-jre8/generate-jetty-start.sh        |  7 +++++--
 docker-entrypoint.sh                    | 27 +++++++++++++++----------
 generate-jetty-start.sh                 |  7 +++++--
 14 files changed, 147 insertions(+), 91 deletions(-)

diff --git a/9.2-jre7/docker-entrypoint.sh b/9.2-jre7/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.2-jre7/docker-entrypoint.sh
+++ b/9.2-jre7/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.2-jre7/generate-jetty-start.sh b/9.2-jre7/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.2-jre7/generate-jetty-start.sh
+++ b/9.2-jre7/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/9.2-jre8/docker-entrypoint.sh b/9.2-jre8/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.2-jre8/docker-entrypoint.sh
+++ b/9.2-jre8/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.2-jre8/generate-jetty-start.sh b/9.2-jre8/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.2-jre8/generate-jetty-start.sh
+++ b/9.2-jre8/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/9.3-jre8/alpine/docker-entrypoint.sh b/9.3-jre8/alpine/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.3-jre8/alpine/docker-entrypoint.sh
+++ b/9.3-jre8/alpine/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.3-jre8/alpine/generate-jetty-start.sh b/9.3-jre8/alpine/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.3-jre8/alpine/generate-jetty-start.sh
+++ b/9.3-jre8/alpine/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/9.3-jre8/docker-entrypoint.sh b/9.3-jre8/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.3-jre8/docker-entrypoint.sh
+++ b/9.3-jre8/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.3-jre8/generate-jetty-start.sh b/9.3-jre8/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.3-jre8/generate-jetty-start.sh
+++ b/9.3-jre8/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/9.4-jre8/alpine/docker-entrypoint.sh b/9.4-jre8/alpine/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.4-jre8/alpine/docker-entrypoint.sh
+++ b/9.4-jre8/alpine/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.4-jre8/alpine/generate-jetty-start.sh b/9.4-jre8/alpine/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.4-jre8/alpine/generate-jetty-start.sh
+++ b/9.4-jre8/alpine/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/9.4-jre8/docker-entrypoint.sh b/9.4-jre8/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/9.4-jre8/docker-entrypoint.sh
+++ b/9.4-jre8/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/9.4-jre8/generate-jetty-start.sh b/9.4-jre8/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/9.4-jre8/generate-jetty-start.sh
+++ b/9.4-jre8/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4adaaaa..f6946e6 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -30,6 +30,11 @@ if [ -z "$TMPDIR" ] ; then
 	TMPDIR=/tmp/jetty
 	mkdir $TMPDIR 2>/dev/null
 fi
+
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
 	*) JAVA_OPTIONS="-Djava.io.tmpdir=$TMPDIR $JAVA_OPTIONS" ;;
@@ -71,31 +76,31 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 		EOWARN
 	fi
 
-	if [ -f $JETTY_BASE/jetty.start ] ; then
-		if [ $JETTY_BASE/start.d -nt $JETTY_BASE/jetty.start ] ; then
+	if [ -f $JETTY_START ] ; then
+		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
 			cat >&2 <<- 'EOWARN'
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
-			         the $JETTY_BASE/jetty.start files was generated. Either delete 
-			         the $JETTY_BASE/jetty.start file or re-run 
-				     /generate-jetty.start.sh 
+			         the $JETTY_START files was generated. Either delete 
+			         the $JETTY_START file or re-run 
+			             /generate-jetty.start.sh 
 			         from a Dockerfile
 			********************************************************************
 			EOWARN
 		fi
-		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start command from \$JETTY_BASE/jetty.start
-		set -- $(cat $JETTY_BASE/jetty.start)
+		echo $(date +'%Y-%m-%d %H:%M:%S.000'):INFO:docker-entrypoint:jetty start from $JETTY_START
+		set -- $(cat $JETTY_START)
 	else
 		# Do a jetty dry run to set the final command
-		"$@" --dry-run > $JETTY_BASE/jetty.start
-		if [ $(egrep -v '\\$' $JETTY_BASE/jetty.start | wc -l ) -gt 1 ] ; then
+		"$@" --dry-run > $JETTY_START
+		if [ $(egrep -v '\\$' $JETTY_START | wc -l ) -gt 1 ] ; then
 			# command was more than a dry-run
-			cat $JETTY_BASE/jetty.start \
+			cat $JETTY_START \
 			| awk '/\\$/ { printf "%s", substr($0, 1, length($0)-1); next } 1' \
 			| egrep -v '[^ ]*java .* org\.eclipse\.jetty\.xml\.XmlConfiguration '
 			exit
 		fi
-		set -- $(sed 's/\\$//' $JETTY_BASE/jetty.start)
+		set -- $(sed 's/\\$//' $JETTY_START)
 	fi
 fi
 
diff --git a/generate-jetty-start.sh b/generate-jetty-start.sh
index 0a7c12d..de78102 100755
--- a/generate-jetty-start.sh
+++ b/generate-jetty-start.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -f $JETTY_BASE/jetty.start
-/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_BASE/jetty.start
+if [ -z "$JETTY_START" ] ; then
+	JETTY_START=$JETTY_BASE/jetty.start
+fi
+rm -f $JETTY_START
+/docker-entrypoint.sh --dry-run | sed 's/\\$//' > $JETTY_START

From 04cd3eb8442405ef0a5e77393abf71ac7ef176ee Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Fri, 6 Oct 2017 12:24:40 +1100
Subject: [PATCH 3/4] Use posix test and set syntax

---
 9.2-jre7/docker-entrypoint.sh        | 10 +++-------
 9.2-jre8/docker-entrypoint.sh        | 10 +++-------
 9.3-jre8/alpine/docker-entrypoint.sh | 10 +++-------
 9.3-jre8/docker-entrypoint.sh        | 10 +++-------
 9.4-jre8/alpine/docker-entrypoint.sh | 10 +++-------
 9.4-jre8/docker-entrypoint.sh        | 10 +++-------
 docker-entrypoint.sh                 | 10 +++-------
 7 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/9.2-jre7/docker-entrypoint.sh b/9.2-jre7/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.2-jre7/docker-entrypoint.sh
+++ b/9.2-jre7/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/9.2-jre8/docker-entrypoint.sh b/9.2-jre8/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.2-jre8/docker-entrypoint.sh
+++ b/9.2-jre8/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/9.3-jre8/alpine/docker-entrypoint.sh b/9.3-jre8/alpine/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.3-jre8/alpine/docker-entrypoint.sh
+++ b/9.3-jre8/alpine/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/9.3-jre8/docker-entrypoint.sh b/9.3-jre8/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.3-jre8/docker-entrypoint.sh
+++ b/9.3-jre8/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/9.4-jre8/alpine/docker-entrypoint.sh b/9.4-jre8/alpine/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.4-jre8/alpine/docker-entrypoint.sh
+++ b/9.4-jre8/alpine/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/9.4-jre8/docker-entrypoint.sh b/9.4-jre8/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/9.4-jre8/docker-entrypoint.sh
+++ b/9.4-jre8/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index f6946e6..d3a19cb 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
 	set -- java -jar "$JETTY_HOME/start.jar" "$@"
 fi
 
-if [ -z "$TMPDIR" ] ; then
-	TMPDIR=/tmp/jetty
-	mkdir $TMPDIR 2>/dev/null
-fi
+: ${TMPDIR:=/tmp/jetty}
+[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null
 
-if [ -z "$JETTY_START" ] ; then
-	JETTY_START=$JETTY_BASE/jetty.start
-fi
+: ${JETTY_START:=$JETTY_BASE/jetty.start}
 
 case "$JAVA_OPTIONS" in
 	*-Djava.io.tmpdir=*) ;;

From 6938dbcf3c3f1e433fca63909400670a52f39dfe Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Fri, 6 Oct 2017 12:26:49 +1100
Subject: [PATCH 4/4] expand env variables in warning

---
 9.2-jre7/docker-entrypoint.sh        | 2 +-
 9.2-jre8/docker-entrypoint.sh        | 2 +-
 9.3-jre8/alpine/docker-entrypoint.sh | 2 +-
 9.3-jre8/docker-entrypoint.sh        | 2 +-
 9.4-jre8/alpine/docker-entrypoint.sh | 2 +-
 9.4-jre8/docker-entrypoint.sh        | 2 +-
 docker-entrypoint.sh                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/9.2-jre7/docker-entrypoint.sh b/9.2-jre7/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.2-jre7/docker-entrypoint.sh
+++ b/9.2-jre7/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/9.2-jre8/docker-entrypoint.sh b/9.2-jre8/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.2-jre8/docker-entrypoint.sh
+++ b/9.2-jre8/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/9.3-jre8/alpine/docker-entrypoint.sh b/9.3-jre8/alpine/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.3-jre8/alpine/docker-entrypoint.sh
+++ b/9.3-jre8/alpine/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/9.3-jre8/docker-entrypoint.sh b/9.3-jre8/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.3-jre8/docker-entrypoint.sh
+++ b/9.3-jre8/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/9.4-jre8/alpine/docker-entrypoint.sh b/9.4-jre8/alpine/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.4-jre8/alpine/docker-entrypoint.sh
+++ b/9.4-jre8/alpine/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/9.4-jre8/docker-entrypoint.sh b/9.4-jre8/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/9.4-jre8/docker-entrypoint.sh
+++ b/9.4-jre8/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d3a19cb..cd8f821 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 
 	if [ -f $JETTY_START ] ; then
 		if [ $JETTY_BASE/start.d -nt $JETTY_START ] ; then
-			cat >&2 <<- 'EOWARN'
+			cat >&2 <<- EOWARN
 			********************************************************************
 			WARNING: The $JETTY_BASE/start.d directory has been modified since
 			         the $JETTY_START files was generated. Either delete