From 270afadccc8069e489b13819e81c56127117e42b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 12 Oct 2023 14:50:53 +0800 Subject: [PATCH] docker update --- README.md | 9 +++++---- .../gen/module_cloud/web/bin/docker/Dockerfile.xml | 2 +- parent/pom.xml | 8 ++++---- web-api/bin/docker/Dockerfile | 2 +- web-fast/bin/docker-build.bat | 2 +- web-fast/bin/docker-build.sh | 2 +- web-fast/bin/docker/Dockerfile | 2 +- web-fast/pom.xml | 2 +- web-fast/src/main/resources/config/application-prod.yml | 2 +- web-fast/src/main/resources/config/application.yml | 2 +- web-mini/bin/docker/Dockerfile | 2 +- web/bin/docker/Dockerfile | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 03b5733c..cb8d15f1 100644 --- 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 ``` - 浏览器访问： 账号 system 密码 admin - 分离端安装： 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 749ff09a..85388e11 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 @@ -5,7 +5,7 @@ Dockerfile ${baseDir}/${moduleCode}/${moduleCode}/bin/docker Dockerfile - UTF-8 - http://192.168.56.102:2375 - thinkgem/${project.artifactId}:5.0 + http://docker.local:2375 + thinkgem/${project.artifactId}:5.5-boot3 8980:8980 @@ -355,11 +355,11 @@ - + io.fabric8 docker-maven-plugin - 0.39.1 + 0.43.4 ${docker.dockerHost} true diff --git a/web-api/bin/docker/Dockerfile b/web-api/bin/docker/Dockerfile index 457af7ea..1ae72a18 100644 --- 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 diff --git a/web-fast/bin/docker-build.bat b/web-fast/bin/docker-build.bat index ac6340db..7974a90e 100644 --- a/web-fast/bin/docker-build.bat +++ b/web-fast/bin/docker-build.bat @@ -19,7 +19,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. diff --git a/web-fast/bin/docker-build.sh b/web-fast/bin/docker-build.sh index d80c002b..603d7a83 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 -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 "" diff --git a/web-fast/bin/docker/Dockerfile b/web-fast/bin/docker/Dockerfile index f7664a2c..1a26c1dc 100644 --- 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 diff --git a/web-fast/pom.xml b/web-fast/pom.xml index 8b095ae3..8d85f33d 100644 --- a/web-fast/pom.xml +++ b/web-fast/pom.xml @@ -25,7 +25,7 @@ com.jeesite.modules.FastApplication - http://192.168.56.102:2375 + http://docker.local:2375 thinkgem/jeesite-web:latest 8980:8980 diff --git a/web-fast/src/main/resources/config/application-prod.yml b/web-fast/src/main/resources/config/application-prod.yml index 0cfdfa4d..be028422 100644 --- 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 diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml index cfd1b3d8..4261ad49 100644 --- 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 diff --git a/web-mini/bin/docker/Dockerfile b/web-mini/bin/docker/Dockerfile index 457af7ea..1ae72a18 100644 --- 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 diff --git a/web/bin/docker/Dockerfile b/web/bin/docker/Dockerfile index 457af7ea..1ae72a18 100644 --- 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