From 07e705fee7e2538334c95863b53061cce53a93c4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 24 Apr 2022 11:36:38 +0800
Subject: [PATCH] =?UTF-8?q?docker=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parent/pom.xml                | 2 --
 web-api/bin/docker-build.bat  | 4 ++--
 web-api/bin/docker-build.sh   | 4 ++--
 web-api/bin/docker/Dockerfile | 4 ++--
 web-api/pom.xml               | 8 +++-----
 web/bin/docker-build.bat      | 4 ++--
 web/bin/docker-build.sh       | 4 ++--
 web/bin/docker/Dockerfile     | 4 ++--
 web/pom.xml                   | 6 ++----
 9 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index a08fd97b..dce01d83 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -64,8 +64,6 @@
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
 		<!-- docker setting -->
-        <docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
-        <docker.imageName>${project.groupId}/${project.artifactId}:5.0</docker.imageName>
         <docker.run.port>8980:8980</docker.run.port>
         
 	</properties>
diff --git a/web-api/bin/docker-build.bat b/web-api/bin/docker-build.bat
index 2f34241c..a70a6f87 100644
--- a/web-api/bin/docker-build.bat
+++ b/web-api/bin/docker-build.bat
@@ -6,14 +6,14 @@ rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
 echo.
-echo [信息] 打包Web工程，导入到Docker服务。
+echo [信息] 打包Web工程，编译Docker镜像
 echo.
 
 %~d0
 cd %~dp0
 
 cd ..
-call mvn clean package docker:stop docker:remove docker:build docker:run -Dmaven.test.skip=true -U
+call mvn clean package docker:remove docker:build -Dmaven.test.skip=true -U
 
 cd bin
 pause
\ No newline at end of file
diff --git a/web-api/bin/docker-build.sh b/web-api/bin/docker-build.sh
index 3ad6d573..ab475930 100644
--- a/web-api/bin/docker-build.sh
+++ b/web-api/bin/docker-build.sh
@@ -7,10 +7,10 @@
 #  * 
 #  */
 echo ""
-echo "[淇℃伅] 浣跨敤 Spring Boot Docker 缂栬瘧 Web 宸ョ▼銆�"
+echo "[淇℃伅] 鎵撳寘Web宸ョ▼锛岀紪璇慏ocker闀滃儚銆�"
 echo ""
 
 cd ..
-mvn clean package docker:stop docker:remove docker:build docker:run -Dmaven.test.skip=true -U
+mvn clean package docker:remove docker:build -Dmaven.test.skip=true -U
 
 cd bin
\ No newline at end of file
diff --git a/web-api/bin/docker/Dockerfile b/web-api/bin/docker/Dockerfile
index e06b6c1f..c0e8feb7 100644
--- a/web-api/bin/docker/Dockerfile
+++ b/web-api/bin/docker/Dockerfile
@@ -18,8 +18,8 @@ ADD ./app.yml ./classes/config/application-prod.yml
 #ENV JAVA_OPTS "-Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT java $JAVA_OPTS -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
+ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
 
 EXPOSE 8980
 
-#docker run -p 8980:8980 com.jeesite/jeesite-web:5.0
+#docker run -p 8980:8980 thinkgem/jeesite-web:5.0
diff --git a/web-api/pom.xml b/web-api/pom.xml
index 807c8aca..7f152561 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -22,16 +22,14 @@
 	<properties>
 		
 		<finalName>web</finalName><!-- war or jar 鍖呯殑鍚嶇О -->
-		<start-class>com.jeesite.modules.Application</start-class>
+		<start-class>com.jeesite.modules.ApiApplication</start-class>
 		
 		<!-- environment setting -->
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
-		<!-- docker setting
-        <docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
-        <docker.imageName>${project.groupId}/${project.artifactId}:5.0</docker.imageName>
-        <docker.run.port>8980:8980</docker.run.port> -->
+		<!-- docker setting -->
+        <docker.run.port>8980:8980</docker.run.port>
 		
 	</properties>
 
diff --git a/web/bin/docker-build.bat b/web/bin/docker-build.bat
index 2f34241c..a70a6f87 100644
--- a/web/bin/docker-build.bat
+++ b/web/bin/docker-build.bat
@@ -6,14 +6,14 @@ rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
 echo.
-echo [信息] 打包Web工程，导入到Docker服务。
+echo [信息] 打包Web工程，编译Docker镜像
 echo.
 
 %~d0
 cd %~dp0
 
 cd ..
-call mvn clean package docker:stop docker:remove docker:build docker:run -Dmaven.test.skip=true -U
+call mvn clean package docker:remove docker:build -Dmaven.test.skip=true -U
 
 cd bin
 pause
\ No newline at end of file
diff --git a/web/bin/docker-build.sh b/web/bin/docker-build.sh
index 3ad6d573..ab475930 100644
--- a/web/bin/docker-build.sh
+++ b/web/bin/docker-build.sh
@@ -7,10 +7,10 @@
 #  * 
 #  */
 echo ""
-echo "[淇℃伅] 浣跨敤 Spring Boot Docker 缂栬瘧 Web 宸ョ▼銆�"
+echo "[淇℃伅] 鎵撳寘Web宸ョ▼锛岀紪璇慏ocker闀滃儚銆�"
 echo ""
 
 cd ..
-mvn clean package docker:stop docker:remove docker:build docker:run -Dmaven.test.skip=true -U
+mvn clean package docker:remove docker:build -Dmaven.test.skip=true -U
 
 cd bin
\ No newline at end of file
diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile
index e06b6c1f..c0e8feb7 100644
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -18,8 +18,8 @@ ADD ./app.yml ./classes/config/application-prod.yml
 #ENV JAVA_OPTS "-Xms256m -Xmx1024m"
 ENV JAVA_OPTS "$JAVA_OPTS -Dspring.profiles.active=prod"
 
-ENTRYPOINT java $JAVA_OPTS -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
+ENTRYPOINT java -cp /app $JAVA_OPTS org.springframework.boot.loader.WarLauncher
 
 EXPOSE 8980
 
-#docker run -p 8980:8980 com.jeesite/jeesite-web:5.0
+#docker run -p 8980:8980 thinkgem/jeesite-web:5.0
diff --git a/web/pom.xml b/web/pom.xml
index d41099a1..8ef02fc5 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -28,10 +28,8 @@
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
-		<!-- docker setting
-        <docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
-        <docker.imageName>${project.groupId}/${project.artifactId}:5.0</docker.imageName>
-        <docker.run.port>8980:8980</docker.run.port> -->
+		<!-- docker setting -->
+        <docker.run.port>8980:8980</docker.run.port>
 		
 	</properties>