docker update

2023-10-12 14:50:53 +08:00
parent 4beb86c2ea
commit 270afadccc
12 changed files with 19 additions and 18 deletions
--- a/README.md
+++ b/README.md
@@ -125,13 +125,14 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 ### 容器运行

 - 拉取 Docker 镜像（演示使用，JeeSite版本较久）：
-```
+```sh
 docker pull thinkgem/jeesite-web
 ```
 - 启动脚本：
-```
-docker run -d -p 8980:8980 --name jeesite-web -v /data:/data \
-thinkgem/jeesite-web && docker logs -f jeesite-web
+```sh
+docker run --name jeesite-web \
+    -p 8980:8980 --privileged -d --restart unless-stopped \
+    -v ~:/data thinkgem/jeesite-web && docker logs -f jeesite-web
 ```
 - 浏览器访问：<http://127.0.0.1:8980/js/>  账号 system 密码 admin
 - 分离端安装：<https://jeesite.com/docs/vue-install-deploy/>
--- 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
@@ -5,7 +5,7 @@
 	<name>Dockerfile</name>
 	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
 	<fileName>Dockerfile</fileName>
-	<content><![CDATA[FROM openjdk:8-slim
+	<content><![CDATA[FROM openjdk:17-slim
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,8 +78,8 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

 		<!-- docker setting -->
-		<docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
-		<docker.imageName>thinkgem/${project.artifactId}:5.0</docker.imageName>
+		<docker.dockerHost>http://docker.local:2375</docker.dockerHost>
+		<docker.imageName>thinkgem/${project.artifactId}:5.5-boot3</docker.imageName>
 		<docker.run.port>8980:8980</docker.run.port>

 	</properties>
@@ -355,11 +355,11 @@
 					</configuration>
 				</plugin>

-				<!-- Docker 插件 https://github.com/fabric8io/docker-maven-plugin -->
+				<!-- Docker 插件 https://github.com/fabric8io/docker-maven-plugin - https://dmp.fabric8.io -->
 				<plugin>
 					<groupId>io.fabric8</groupId>
 					<artifactId>docker-maven-plugin</artifactId>
-					<version>0.39.1</version>
+					<version>0.43.4</version>
 					<configuration>
 						<dockerHost>${docker.dockerHost}</dockerHost>
 						<verbose>true</verbose>
--- a/web-api/bin/docker/Dockerfile
+++ b/web-api/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM openjdk:17-slim
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
--- a/web-fast/bin/docker-build.bat
+++ b/web-fast/bin/docker-build.bat
@@ -19,7 +19,7 @@ echo.
 echo.
 echo <20>ο<EFBFBD><CEBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ľű<C4BD><C5B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Docker <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD>
 echo.
-echo "docker run -d -p 8980:8980 --name jeesite-web --restart unless-stopped -v /data:/data thinkgem/jeesite-web && docker logs -f jeesite-web"
+echo "docker run --name jeesite-web -p 8980:8980 --privileged -d --restart unless-stopped -v ~:/data thinkgem/jeesite-web && docker logs -f jeesite-web"
 echo.
 echo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɺ󣬷<C9BA><F3A3ACB7><EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF>http://127.0.0.1:8980/js/a/login   <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>system   <20><><EFBFBD>룺admin
 echo.
--- a/web-fast/bin/docker-build.sh
+++ b/web-fast/bin/docker-build.sh
@@ -17,7 +17,7 @@ echo ""
 echo ""
 echo "参考下面的脚本，拷贝到 Docker 服务器上运行："
 echo ""
-echo "docker run -d -p 8980:8980 --name jeesite-web --restart unless-stopped -v /data:/data thinkgem/jeesite-web && docker logs -f jeesite-web"
+echo "docker run --name jeesite-web -p 8980:8980 --privileged -d --restart unless-stopped -v ~:/data thinkgem/jeesite-web && docker logs -f jeesite-web"
 echo ""
 echo "启动完成后，访问项目：http://127.0.0.1:8980/js/a/login   用户名：system   密码：admin"
 echo ""
--- a/web-fast/bin/docker/Dockerfile
+++ b/web-fast/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM openjdk:17-slim
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -25,7 +25,7 @@
 		<start-class>com.jeesite.modules.FastApplication</start-class>

 		<!-- docker setting -->
-        <docker.dockerHost>http://192.168.56.102:2375</docker.dockerHost>
+        <docker.dockerHost>http://docker.local:2375</docker.dockerHost>
        <docker.imageName>thinkgem/jeesite-web:latest</docker.imageName>
        <docker.run.port>8980:8980</docker.run.port>
 		
--- a/web-fast/src/main/resources/config/application-prod.yml
+++ b/web-fast/src/main/resources/config/application-prod.yml
@@ -7,7 +7,7 @@ jdbc:
  # Mysql 数据库配置
  type: h2
  driver: org.h2.Driver
-  url: jdbc:h2:/data/jeesite-db/jeesite501
+  url: jdbc:h2:/data/jeesite-db/jeesite551
  username: jeesite
  password: jeesite
  testSql: SELECT 1
--- a/web-fast/src/main/resources/config/application.yml
+++ b/web-fast/src/main/resources/config/application.yml
@@ -53,7 +53,7 @@ jdbc:
  # H2 数据库配置（请修改 /modules/core/pom.xml 文件，打开 H2 DB 依赖）
  type: h2
  driver: org.h2.Driver
-  url: jdbc:h2:~/jeesite-db/jeesite501
+  url: jdbc:h2:~/jeesite-db/jeesite551
  username: jeesite
  password: jeesite
  testSql: SELECT 1
--- a/web-mini/bin/docker/Dockerfile
+++ b/web-mini/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM openjdk:17-slim
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-slim
+FROM openjdk:17-slim
 LABEL maintainer="ThinkGem@163.com"
 ENV TZ "Asia/Shanghai"
 ENV LANG C.UTF-8