From 6938dbcf3c3f1e433fca63909400670a52f39dfe Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 6 Oct 2017 12:26:49 +1100 Subject: [PATCH] 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