From 1e048ff961b5adca0e9c07a7e8f6a2b78bc5b4c8 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Tue, 16 Mar 2021 12:55:13 -0400
Subject: [PATCH] split setenv

---
 Dockerfile           |  6 ++++--
 docker-entrypoint.sh |  9 ++++-----
 pom.xml              | 28 +++++++++++++++++++++++++++-
 setenv.sh            |  4 ++++
 4 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 setenv.sh

diff --git a/Dockerfile b/Dockerfile
index 2b26a54..93f54c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ FROM ubuntu:${ubuntu.version}
 ENV JAVA_MEMORY_INIT=128m
 ENV JAVA_MEMORY_MAX=512m
 ENV JAVA_HOME=/usr/local/lib/jvm/java-openjdk-dcevm
+ENV JRE_HOME=/usr/local/lib/jvm/java-openjdk-dcevm
 ENV JAVA_OPTS=
 
 # Install curl
@@ -24,10 +25,11 @@ RUN mkdir -p /var/lib/jvm && cd /var/lib/jvm && \
         mkdir classes classes-extra1 classes-extra2 classes-extra3 classes-extra4 classes-extra5 classes-extra6 classes-extra7 && \
         mkdir lib lib-extra1 lib-extra2 lib-extra3 lib-extra4 lib-extra5 lib-extra6 lib-extra7
 
-# Add our Docker container initialization script
+# Add our Docker container initialization scripts
+ADD setenv.sh /usr/local/bin/${project.artifactId}-setenv.sh
 ADD docker-entrypoint.sh /usr/local/bin
 
-# Add our default hotswap configuration; may be overwritten
+# Add our default hotswap configuration; may be overwritten in dev/classes* volumes
 ADD hotswap-agent.properties /var/lib/jvm/lib
 
 # Listening for Java debugger traffic
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index aba9d7f..6dbe6d7 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,10 +1,9 @@
-#!/bin/bash
-JAVA_OPTS="${JAVA_OPTS} -Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX}"
-JAVA_OPTS="${JAVA_OPTS} -XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar"
-JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+#!/bin/sh
+. /usr/local/bin/java-dcevm-hotswap-setenv.sh
 
 JAVA_CP="/var/lib/jvm/classes:/var/lib/jvm/classes-extra1:/var/lib/jvm/classes-extra2:/var/lib/jvm/classes-extra3:/var/lib/jvm/classes-extra4:/var/lib/jvm/classes-extra5:/var/lib/jvm/classes-extra6:/var/lib/jvm/classes-extra7"
 JAVA_CP="${JAVA_CP}:/var/lib/jvm/lib/*:/var/lib/jvm/lib-extra1/*:/var/lib/jvm/lib-extra2/*:/var/lib/jvm/lib-extra3/*:/var/lib/jvm/lib-extra4/*:/var/lib/jvm/lib-extra5/*:/var/lib/jvm/lib-extra6/*:/var/lib/jvm/lib-extra7/*"
 EXEC_JAVA_OPTS="${JAVA_OPTS} --classpath ${JAVA_CP}"
 
-exec "/usr/local/lib/jvm/java-openjdk-dcevm/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS}"
+#exec "/usr/local/lib/jvm/java-openjdk-dcevm/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS}"
+exec "$@"
diff --git a/pom.xml b/pom.xml
index 1fcd0dd..08f1648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,33 @@
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>*.sh</include>
+                    <include>*.properties</include>
+                </includes>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>resources</goal></goals>
+                        <configuration>
+                            <encoding>utf-8</encoding>
+                            <propertiesEncoding>utf-8</propertiesEncoding>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin build and pushes the Docker image -->
             <plugin>
                 <groupId>io.fabric8</groupId>
@@ -42,7 +68,7 @@
                             <registry>${image.registry}</registry>
                         </image>
                     </images>
-                    <contextDir>${basedir}</contextDir>
+                    <contextDir>${project.build.directory}</contextDir>
                     <buildStrategy>docker</buildStrategy>
                     <verbose>true</verbose>
                 </configuration>
diff --git a/setenv.sh b/setenv.sh
new file mode 100644
index 0000000..d4a7276
--- /dev/null
+++ b/setenv.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+JAVA_OPTS="${JAVA_OPTS} -Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX}"
+JAVA_OPTS="${JAVA_OPTS} -XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar"
+JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"