From b1e69564dcd9dac4f20852f25d0eb3f1d181febb Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 22 Apr 2021 20:06:06 +0200
Subject: [PATCH] fixed docker build

---
 docker/Dockerfile | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b2868860..1f72da5f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,19 +6,36 @@ ENV JAVA_HEAP_MIN=
 ENV JAVA_HEAP_MAX=
 
 #just try wihtout user to check if we habe a permission problem
-#RUN groupadd --system spring && useradd --system --gid spring spring && mkdir /sebserver && chown spring:spring /sebserver
-#USER spring:spring
+RUN groupadd --system spring && useradd --system --gid spring spring && mkdir /sebserver && chown spring:spring /sebserver
+USER spring:spring
 
 COPY docker/start-sebserver.sh seb-server.jar /sebserver/
 
 WORKDIR /sebserver
 
+# NOTE: This seems not to work, maybe some permission problems, how knows!?
 #CMD /bin/sh /sebserver/start-sebserver.sh
 
-CMD exec java \
-    -Xms${JAVA_HEAP_MIN} \
-    -Xmx${JAVA_HEAP_MAX} \
-    -jar "seb-server.jar" \
-    --spring.config.location=file:/sebserver/config/spring/,classpath:/config/;
+CMD if [ "x${JMX_PORT}" = "x" ] ; \
+    then exec java \
+        -Xms${JAVA_HEAP_MIN} \
+        -Xmx${JAVA_HEAP_MAX} \
+        -jar "seb-server.jar" \
+        --spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
+    else echo "admin ${SEBSERVER_SECRET}" > jmxremote.password && chown spring:spring /sebserver/jmxremote.password && chmod 400 /sebserver/jmxremote.password && exec java \
+        -Xms${JAVA_HEAP_MIN} \
+        -Xmx${JAVA_HEAP_MAX} \
+        -Dcom.sun.management.jmxremote \
+        -Dcom.sun.management.jmxremote.port=${JMX_PORT} \
+        -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT} \
+        -Djava.rmi.server.hostname=localhost \
+        -Dcom.sun.management.jmxremote.local.only=false \
+        -Dcom.sun.management.jmxremote.ssl=false \
+        -Dcom.sun.management.jmxremote.authenticate=true \
+        -Dcom.sun.management.jmxremote.password.file=/sebserver/jmxremote.password \
+        -Dcom.sun.management.jmxremote.access.file=/sebserver/config/jmx/jmxremote.access \
+        -jar "seb-server.jar" \
+        --spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
+fi
 
 EXPOSE $SERVER_PORT $JMX_PORT
\ No newline at end of file