zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix docker build?!?!?!?

Browse source
This commit is contained in:
anhefti 2021-04-22 18:15:25 +02:00
parent e4890a0f13
commit 7d78e412a9
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docker/Dockerfile
View file

@ -13,6 +13,12 @@ COPY docker/start-sebserver.sh seb-server.jar /sebserver/
WORKDIR /sebserver
CMD /bin/sh /sebserver/start-sebserver.sh
#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/;
EXPOSE $SERVER_PORT $JMX_PORT

42
docker/start-sebserver.sh
View file

@ -1,28 +1,22 @@
#!/bin/sh
exec java \
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/;
#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
--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