diff --git a/chsm-web-manage/Dockerfile b/chsm-web-manage/Dockerfile index a832d11..40bc4cd 100644 --- a/chsm-web-manage/Dockerfile +++ b/chsm-web-manage/Dockerfile @@ -1,13 +1,8 @@ FROM dragonwell8 -# FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 WORKDIR /app - -ADD target/chsm-web-manager.jar /app/chsm-web-manager.jar -ENV ENABLE_DEBUG=false -ENV DEBUG_PORT=5005 +COPY target/chsm-web-manager.jar /app/app.jar +ENV JVM_OPTS="" +ENV ARGS_OPTS="" EXPOSE 9880 -# ENTRYPOINT ["insmod","/opt/driver/SJK1117-H/SJK1117_H.ko"] -# ENTRYPOINT ["/bin/bash", "/opt/driver/SYD1308-G/install_driver.sh"] -# ENTRYPOINT ["java","-jar","chsm-manage.jar"] -ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-web-manager.jar; else java -jar chsm-web-manager.jar; fi"] +ENTRYPOINT ["sh","-c","java $JVM_OPTS -jar app.jar $ARGS_OPTS"] diff --git a/chsm-web-server/Dockerfile b/chsm-web-server/Dockerfile index bc5dc29..7487308 100644 --- a/chsm-web-server/Dockerfile +++ b/chsm-web-server/Dockerfile @@ -1,13 +1,8 @@ FROM dragonwell8 -# FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 WORKDIR /app - -ADD target/chsm-web-server.jar /app/chsm-web-server.jar -ENV ENABLE_DEBUG=false -ENV DEBUG_PORT=5005 +COPY target/chsm-web-server.jar /app/app.jar +ENV JVM_OPTS="" +ENV ARGS_OPTS="" EXPOSE 9890 -# ENTRYPOINT ["insmod","/opt/driver/SJK1117-H/SJK1117_H.ko"] -# ENTRYPOINT ["/bin/bash", "/opt/driver/SYD1308-G/install_driver.sh"] -# ENTRYPOINT ["java","-jar","chsm-manage.jar"] -ENTRYPOINT ["/bin/bash", "-c", "if [ \"$ENABLE_DEBUG\" = \"true\" ]; then java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT -jar chsm-web-server.jar; else java -jar chsm-web-server.jar; fi"] +ENTRYPOINT ["sh","-c","java $JVM_OPTS -jar app.jar $ARGS_OPTS"] \ No newline at end of file