From bc6f05b1f8b358b57e25733420a930a1d827f1c1 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Tue, 16 Mar 2021 11:50:31 -0400
Subject: [PATCH] added automatic classpath loading and JAVA_CLASS envvar usage

---
 Dockerfile           |  4 +---
 docker-entrypoint.sh | 10 ++++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fc56881..2b26a54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM ubuntu:${ubuntu.version}
 # Configure standard JAVA parameters
 ENV JAVA_MEMORY_INIT=128m
 ENV JAVA_MEMORY_MAX=512m
+ENV JAVA_HOME=/usr/local/lib/jvm/java-openjdk-dcevm
 ENV JAVA_OPTS=
 
 # Install curl
@@ -37,6 +38,3 @@ EXPOSE 8000
 
 # Execute the Docker container initialization script
 ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
-
-# Do nothing meaningful; made to be overridden
-CMD [ "-version" ]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 5eaa901..aba9d7f 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
-JAVA_OPTS="-Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX} -XX:HotswapAgent=external -javaagent:/usr/local/lib/jvm/hotswap-agent.jar -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n $JAVA_OPTS"
+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"
 
-exec "/usr/local/lib/jvm/java-openjdk-dcevm/bin/java ${JAVA_OPTS} $@"
+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}"