From fd0394df3c02b9c8cf0dc2c5dd99a0b28248552e Mon Sep 17 00:00:00 2001 From: Brian Long Date: Tue, 16 Mar 2021 13:00:05 -0400 Subject: [PATCH] split setenv --- Dockerfile | 1 + docker-entrypoint.sh | 5 +++-- setenv.sh | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 setenv.sh diff --git a/Dockerfile b/Dockerfile index 89b71bf..6f03522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ RUN cd /var/lib/tomcat/dev && \ mkdir web web-extra1 web-extra2 web-extra3 web-extra4 web-extra5 web-extra6 web-extra7 # Add our Docker container initialization script +ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh COPY docker-entrypoint.sh /usr/local/bin # Add our Apache Tomcat configuration diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a3ce824..0642437 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,4 +1,5 @@ -#!/bin/bash -CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" +#!/bin/sh +. /usr/local/bin/java-dcevm-hotswap-setenv.sh +. /usr/local/bin/tomcat-rad-setenv.sh exec "$@" diff --git a/setenv.sh b/setenv.sh new file mode 100644 index 0000000..99cb4d2 --- /dev/null +++ b/setenv.sh @@ -0,0 +1,2 @@ +#!/bin/sh +CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}"