diff --git a/chsm-web-manage/Dockerfile b/chsm-web-manage/Dockerfile new file mode 100644 index 0000000..8643c59 --- /dev/null +++ b/chsm-web-manage/Dockerfile @@ -0,0 +1,13 @@ +# FROM alibabadragonwell/dragonwell:8.28.21 +FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 + +WORKDIR /app + +ADD target/chsm-manage.jar /app/chsm-manage.jar +ENV ENABLE_DEBUG=false +ENV DEBUG_PORT=5005 +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-manage.jar; else java -jar chsm-manage.jar; fi"] diff --git a/chsm-web-manage/build.cmd b/chsm-web-manage/build.cmd new file mode 100644 index 0000000..bc65c52 --- /dev/null +++ b/chsm-web-manage/build.cmd @@ -0,0 +1,18 @@ +@echo off +SETLOCAL + +chcp 65001 + +del /S *.log + +call mvn clean -DskipTests=true package -f ../pom.xml + +echo ">>>>>>>>>>>begin build docker image ...<<<<<<<<<<<<<" +docker build -t chsm-manage:latest . +echo ">>>>>>>>>>>build docker image success<<<<<<<<<<<<<" + +docker save -o chsm-manage.tar chsm-manage:latest +echo ">>>>>>>>>>>build docker offline tar success<<<<<<<<<<<<<" + +pause + diff --git a/chsm-web-manage/pom.xml b/chsm-web-manage/pom.xml index 76a18cb..218a856 100644 --- a/chsm-web-manage/pom.xml +++ b/chsm-web-manage/pom.xml @@ -118,16 +118,7 @@ - - - src/main/resources - - **/** - - false - - - + chsm-manage org.springframework.boot diff --git a/chsm-web-manage/src/main/resources/application.yml b/chsm-web-manage/src/main/resources/application.yml index 92618a0..3e99c1c 100644 --- a/chsm-web-manage/src/main/resources/application.yml +++ b/chsm-web-manage/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 89 + port: 9880 tomcat: uri-encoding: UTF-8 threads: diff --git a/chsm-web-server/Dockerfile b/chsm-web-server/Dockerfile new file mode 100644 index 0000000..df12566 --- /dev/null +++ b/chsm-web-server/Dockerfile @@ -0,0 +1,13 @@ +# FROM alibabadragonwell/dragonwell:8.28.21 +FROM registry.cn-hangzhou.aliyuncs.com/fullstack/dragonwell8 + +WORKDIR /app + +ADD target/chsm-server.jar /app/chsm-server.jar +ENV ENABLE_DEBUG=false +ENV DEBUG_PORT=5005 +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-server.jar; else java -jar chsm-server.jar; fi"] diff --git a/chsm-web-server/build.cmd b/chsm-web-server/build.cmd new file mode 100644 index 0000000..aa6d04b --- /dev/null +++ b/chsm-web-server/build.cmd @@ -0,0 +1,18 @@ +@echo off +SETLOCAL + +chcp 65001 + +del /S *.log + +call mvn clean -DskipTests=true package -f ../pom.xml + +echo ">>>>>>>>>>>begin build docker image ...<<<<<<<<<<<<<" +docker build -t chsm-server:latest . +echo ">>>>>>>>>>>build docker image success<<<<<<<<<<<<<" + +docker save -o chsm-server.tar chsm-manage:latest +echo ">>>>>>>>>>>build docker offline tar success<<<<<<<<<<<<<" + +pause + diff --git a/chsm-web-server/pom.xml b/chsm-web-server/pom.xml index 69c9382..0add2e0 100644 --- a/chsm-web-server/pom.xml +++ b/chsm-web-server/pom.xml @@ -44,6 +44,7 @@ + chsm-server org.springframework.boot diff --git a/chsm-web-server/src/main/resources/application.yml b/chsm-web-server/src/main/resources/application.yml index 6b124ce..f663b23 100644 --- a/chsm-web-server/src/main/resources/application.yml +++ b/chsm-web-server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8900 + port: 9890 tomcat: uri-encoding: UTF-8 threads: