From 86bd2589e699ffb0049efc484c0704f250a21ec6 Mon Sep 17 00:00:00 2001 From: trainliang Date: Thu, 27 Jan 2022 16:03:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=80=82=E9=85=8Ddocker=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gen/src/main/resources/application.properties | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gen/src/main/resources/application.properties b/gen/src/main/resources/application.properties index 490d4f7..1d11608 100644 --- a/gen/src/main/resources/application.properties +++ b/gen/src/main/resources/application.properties @@ -1,10 +1,10 @@ spring.application.name=gen -server.port=6969 +server.port=${SERVER_PORT:6969} -spring.datasource.driver-class-name=org.sqlite.JDBC -spring.datasource.url=jdbc:sqlite:gen.db -spring.datasource.username= -spring.datasource.password= +spring.datasource.driver-class-name=${DATASOURCE_DRIVE:org.sqlite.JDBC} +spring.datasource.url=${DATASOURCE_URL:jdbc:sqlite:gen.db} +spring.datasource.username=${DATASOURCE_USERNAME:} +spring.datasource.password=${DATASOURCE_PASSWORD:} # ========================================== # 默认使用sqlite数据库，如果要改成mysql，步骤如下： @@ -20,12 +20,11 @@ spring.datasource.password= mybatis.mapper-locations=classpath:mybatis/*.xml # 下划线格式转换成驼峰格式 -mybatis.configuration.map-underscore-to-camel-case=true +mybatis.configuration.map-underscore-to-camel-case= ${MAP_UND_TO_CAMEL_CASE:true} # 格式化xml代码，默认false # 开启后生成速度会稍微慢一点 -gen.format-xml=false +gen.format-xml= ${GEN_FORMAT_XML:false} # database name -gen.db-name=gen - -logging.file.path=log +gen.db-name=${GEN_DBNAME:gen} +logging.file.path=${LOGGING_FILE_PATH:log} -- Gitee From 8031df261e75760e53339034e9553d42790676d6 Mon Sep 17 00:00:00 2001 From: trainliang Date: Thu, 27 Jan 2022 16:30:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=94=AF=E6=8C=81arm64=E7=9A=84docker=E5=BA=95=E5=8C=85;?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E6=89=93=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- readme.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 01c1ee9..17725cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM java:8 +FROM openjdk:8-jre-slim-buster VOLUME /tmp ADD gen/target/*.jar gen.jar diff --git a/readme.md b/readme.md index 00c7321..fce74f8 100644 --- a/readme.md +++ b/readme.md @@ -33,6 +33,7 @@ - 方式二：本地构建镜像 + clone代码，然后执行`docker-build.sh`脚本 执行`docker run --name gen -p 6969:6969 -d <镜像ID>` @@ -82,6 +83,14 @@ Mac/Linux系统可直接执行`build.sh`进行构建，构建结果在`dist/gen` - 将`gen-1.0.0-SNAPSHOT.jar`放在`dist/gen`下，确保jar和`view`在同一目录 - 执行`java -jar gen-xx-SNAPSHOT.jar` - 浏览器访问`http://localhost:6969/` +## 构建多平台 + + - 安装多平台buildx : `docker buildx create --use --name m1_builder` + + - 查看并启动 builder 实例：`docker buildx inspect --bootstrap` + + - 打包多平台镜像：`docker buildx build -t tanghc2020/gen --platform=linux/amd64,linux/arm64/v8 -o type=docker .` + ## 效果图 -- Gitee From 9cac70201aff2386bc6eaee9ce7925fd6b4b26bf Mon Sep 17 00:00:00 2001 From: trainliang Date: Thu, 27 Jan 2022 16:59:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=94=AF=E6=8C=81arm64=E7=9A=84docker=E5=BA=95=E5=8C=85;?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E6=89=93=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index fce74f8..972d15a 100644 --- a/readme.md +++ b/readme.md @@ -89,7 +89,11 @@ Mac/Linux系统可直接执行`build.sh`进行构建，构建结果在`dist/gen` - 查看并启动 builder 实例：`docker buildx inspect --bootstrap` - - 打包多平台镜像：`docker buildx build -t tanghc2020/gen --platform=linux/amd64,linux/arm64/v8 -o type=docker .` + - 一次打包多平台镜像并推送 + - 打包多平台镜像并推送：`docker buildx build -t tanghc2020/gen --platform=linux/amd64,linux/arm64/v8 --push` + - 或打包保存在本地 + - 打包x64平台镜像在本地：`docker buildx build -t tanghc2020/gen --platform=linux/amd64 -o type=docker .` + - 打包arm64平台镜像在本地：`docker buildx build -t tanghc2020/gen --platform=linux/arm64/v8 -o type=docker .` ## 效果图 -- Gitee From 43cf35d254cf285880ca242b14551df2f28154cf Mon Sep 17 00:00:00 2001 From: trainliang Date: Thu, 27 Jan 2022 17:19:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=94=AF=E6=8C=81arm64=E7=9A=84docker=E5=BA=95=E5=8C=85;?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E6=89=93=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 -- Gitee From 2e05fea17ef5844c74eafded8e6f44126467e497 Mon Sep 17 00:00:00 2001 From: trainliang Date: Thu, 27 Jan 2022 17:20:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=94=AF=E6=8C=81arm64=E7=9A=84docker=E5=BA=95=E5=8C=85;?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E6=89=93=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 972d15a..628ed25 100644 --- a/readme.md +++ b/readme.md @@ -90,11 +90,11 @@ Mac/Linux系统可直接执行`build.sh`进行构建，构建结果在`dist/gen` - 查看并启动 builder 实例：`docker buildx inspect --bootstrap` - 一次打包多平台镜像并推送 - - 打包多平台镜像并推送：`docker buildx build -t tanghc2020/gen --platform=linux/amd64,linux/arm64/v8 --push` + - 打包多平台镜像并推送：`docker buildx build -t tanghc2020/gen --platform=linux/amd64,linux/arm64/v8 . --push` - 或打包保存在本地 - 打包x64平台镜像在本地：`docker buildx build -t tanghc2020/gen --platform=linux/amd64 -o type=docker .` - 打包arm64平台镜像在本地：`docker buildx build -t tanghc2020/gen --platform=linux/arm64/v8 -o type=docker .` - + - 快速运行：`docker run -d -p 6969:6969 tanghc2020/gen` ## 效果图 -- Gitee