From 21215850e4c619c060218d1184588bb06cdd857a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 28 Feb 2024 10:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Docker=E5=A4=9ACPU=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    | 4 ++--
 parent/pom.xml               | 6 +++++-
 web-fast/bin/docker-build.sh | 2 +-
 web-fast/pom.xml             | 6 +++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index febd9ca0..44d0ac55 100644
--- a/README.md
+++ b/README.md
@@ -126,12 +126,12 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 
 - 拉取 Docker 镜像（演示使用，JeeSite版本较久）：
 ```sh
-docker pull thinkgem/jeesite-web:latest(arm64)
+docker pull thinkgem/jeesite-web
 ```
 - 启动脚本：
 ```sh
 docker run --name jeesite-web -p 8980:8980 -d --restart unless-stopped \
-    -v ~:/data thinkgem/jeesite-web:latest(arm64) && docker logs -f jeesite-web
+    -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/>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f1e61cd..64dc2f90 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,8 @@
 
 		<!-- docker setting -->
 		<docker.dockerHost>http://docker.local:2375</docker.dockerHost>
-		<docker.imageName>thinkgem/${project.artifactId}:5.5-boot3</docker.imageName>
+		<docker.imageName>thinkgem/${project.artifactId}:latest</docker.imageName>
+		<docker.platform>linux/amd64</docker.platform>
 		<docker.run.port>8980:8980</docker.run.port>
 
 	</properties>
@@ -368,6 +369,9 @@
 								<alias>${project.artifactId}</alias>
 								<build>
 									<dockerFile>${project.basedir}/bin/docker/Dockerfile</dockerFile>
+									<buildOptions>
+										<platform>${docker.platform}</platform>
+									</buildOptions>
 									<assembly>
 										<descriptorRef>artifact</descriptorRef>
 									</assembly>
diff --git a/web-fast/bin/docker-build.sh b/web-fast/bin/docker-build.sh
index cdfddf08..ee7f5bdc 100644
--- 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 --name jeesite-web -p 8980:8980 -d --restart unless-stopped -v ~:/data thinkgem/jeesite-web && docker logs -f jeesite-web"
+echo "docker run --name jeesite-web -p 8980:8980 -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 ""
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 0ed139f4..1ef20310 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -25,8 +25,12 @@
 		<start-class>com.jeesite.modules.FastApplication</start-class>
 
 		<!-- docker setting -->
-		<docker.dockerHost>http://docker.local:2375</docker.dockerHost>
+		<docker.dockerHost>unix:///var/run/docker.sock</docker.dockerHost>
 		<docker.imageName>thinkgem/jeesite-web:latest</docker.imageName>
+<!--		<docker.imageName>thinkgem/jeesite-web:amd64</docker.imageName>-->
+<!--		<docker.platform>linux/amd64</docker.platform>-->
+<!--		<docker.imageName>thinkgem/jeesite-web:arm64</docker.imageName>-->
+<!--		<docker.platform>linux/arm64</docker.platform>-->
 		<docker.run.port>8980:8980</docker.run.port>
 		
 	</properties>