From e4890a0f1387b545564feada1dfe91f04f1f4b35 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 22 Apr 2021 17:58:18 +0200 Subject: [PATCH] fix docker image get back to roots --- docker/start-sebserver.sh | 48 ++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/docker/start-sebserver.sh b/docker/start-sebserver.sh index 8dc36a19..23dec483 100644 --- a/docker/start-sebserver.sh +++ b/docker/start-sebserver.sh @@ -1,22 +1,28 @@ #!/bin/sh -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 \ No newline at end of file +exec java \ + -Xms${JAVA_HEAP_MIN} \ + -Xmx${JAVA_HEAP_MAX} \ + -jar "seb-server.jar" \ + --spring.config.location=file:/sebserver/config/spring/,classpath:/config/; + +#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 \ No newline at end of file