From 401f5d0efdbe2e0cf0703d07413d0f8bf41edc0e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 24 Apr 2022 11:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85Cloud=E7=9A=84Docker=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/templates/modules/gen/config.xml  | 2 ++
 .../modules/gen/module_cloud/web/bin/docker-build.bat.xml     | 4 ++--
 .../modules/gen/module_cloud/web/bin/docker-build.sh.xml      | 4 ++--
 .../modules/gen/module_cloud/web/bin/docker/Dockerfile.xml    | 4 ++--
 .../templates/modules/gen/module_cloud/web/bin/docker/app.xml | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index 0ef163a1..fabbb7e9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -212,6 +212,8 @@
 			<template>module_cloud/client/bin/package.sh.xml</template>
 			<template>module_cloud/client/src/main/java/package.xml</template>
 			<template>module_cloud/client/pom.xml</template>
+			<template>module_cloud/web/bin/docker/app.xml</template>
+			<template>module_cloud/web/bin/docker/Dockerfile.xml</template>
 			<template>module_cloud/web/bin/docker-build.bat.xml</template>
 			<template>module_cloud/web/bin/docker-build.sh.xml</template>
 			<template>module_cloud/web/bin/package.bat.xml</template>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
index 2ec706f1..4aa20dbc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
@@ -14,14 +14,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]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
index c53b8d91..8ac2ba5c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
@@ -14,11 +14,11 @@
 #  * 
 #  */
 echo ""
-echo "[信息] 使用 Spring Boot Docker 编译 Web 工程。"
+echo "[信息] 打包Web工程，编译Docker镜像。"
 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]]>
 	</content>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
index 74b94b11..dd9bf245 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
@@ -24,11 +24,11 @@ ADD ./app.yml ./classes/config/bootstrap-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 8983
 
-#docker run -p 8983:8983 com.jeesite/jeesite-cloud-module-${moduleCode}:4.2
+#docker run -p 8983:8983 com.jeesite/jeesite-cloud-module-${moduleCode}:5.0
 ]]>
 	</content>
 </template>
\ No newline at end of file
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
index 68fe4832..086b9580 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/app.xml
@@ -4,7 +4,7 @@
 <template>
 	<name>app</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
-	<fileName>app</fileName>
+	<fileName>app.yml</fileName>
 	<content><![CDATA[    
 #======================================#
 #========== Cloud settings ============#