diff --git a/Dockerfile b/Dockerfile index 01c1ee9b19e72d8b6b85870bf9990600b870bac5..17725cf8cfe7de7c40ae40b46f1874861817514b 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/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/gen/src/main/resources/application.properties b/gen/src/main/resources/application.properties index 490d4f76b3859448ac3ebf5467821c426e58307e..1d116082b6302233e5252f40cca4d592fdc252cd 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} diff --git a/readme.md b/readme.md index 00c7321be8ec5546327e0bc9c7c07fa50549da94..628ed25e6f54b8ec5d4bc19290188e7efc3939dc 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,18 @@ 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 . --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` ## 效果图