fix docker build?!?!?!?
This commit is contained in:
parent
e4890a0f13
commit
7d78e412a9
2 changed files with 28 additions and 28 deletions
|
@ -13,6 +13,12 @@ COPY docker/start-sebserver.sh seb-server.jar /sebserver/
|
||||||
|
|
||||||
WORKDIR /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
|
EXPOSE $SERVER_PORT $JMX_PORT
|
|
@ -1,28 +1,22 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
exec java \
|
if [ "x${JMX_PORT}" = "x" ] ; \
|
||||||
-Xms${JAVA_HEAP_MIN} \
|
then exec java \
|
||||||
-Xmx${JAVA_HEAP_MAX} \
|
-Xms${JAVA_HEAP_MIN} \
|
||||||
-jar "seb-server.jar" \
|
-Xmx${JAVA_HEAP_MAX} \
|
||||||
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/;
|
-jar "seb-server.jar" \
|
||||||
|
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||||
#if [ "x${JMX_PORT}" = "x" ] ; \
|
else echo "admin ${SEBSERVER_SECRET}" > jmxremote.password && chown spring:spring /sebserver/jmxremote.password && chmod 400 /sebserver/jmxremote.password && exec java \
|
||||||
# then exec java \
|
-Xms${JAVA_HEAP_MIN} \
|
||||||
# -Xms${JAVA_HEAP_MIN} \
|
-Xmx${JAVA_HEAP_MAX} \
|
||||||
# -Xmx${JAVA_HEAP_MAX} \
|
-Dcom.sun.management.jmxremote \
|
||||||
# -jar "seb-server.jar" \
|
-Dcom.sun.management.jmxremote.port=${JMX_PORT} \
|
||||||
# --spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
-Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT} \
|
||||||
# else echo "admin ${SEBSERVER_SECRET}" > jmxremote.password && chown spring:spring /sebserver/jmxremote.password && chmod 400 /sebserver/jmxremote.password && exec java \
|
-Djava.rmi.server.hostname=localhost \
|
||||||
# -Xms${JAVA_HEAP_MIN} \
|
-Dcom.sun.management.jmxremote.local.only=false \
|
||||||
# -Xmx${JAVA_HEAP_MAX} \
|
-Dcom.sun.management.jmxremote.ssl=false \
|
||||||
# -Dcom.sun.management.jmxremote \
|
-Dcom.sun.management.jmxremote.authenticate=true \
|
||||||
# -Dcom.sun.management.jmxremote.port=${JMX_PORT} \
|
-Dcom.sun.management.jmxremote.password.file=/sebserver/jmxremote.password \
|
||||||
# -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT} \
|
-Dcom.sun.management.jmxremote.access.file=/sebserver/config/jmx/jmxremote.access \
|
||||||
# -Djava.rmi.server.hostname=localhost \
|
-jar "seb-server.jar" \
|
||||||
# -Dcom.sun.management.jmxremote.local.only=false \
|
--spring.config.location=file:/sebserver/config/spring/,classpath:/config/; \
|
||||||
# -Dcom.sun.management.jmxremote.ssl=false \
|
fi
|
||||||
# -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
|
|
Loading…
Reference in a new issue