From a9a7a2b47bfbeb0f10d048be8749712eda13acbc Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 12 May 2023 13:38:15 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20docker=E6=9E=84=E5=BB=BA=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=9B=B4=E6=8D=A2=E4=B8=BAfabric?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-auth/pom.xml | 14 +---- blade-gateway/pom.xml | 14 +---- blade-ops/blade-admin/pom.xml | 14 +---- blade-ops/blade-flow/pom.xml | 14 +---- blade-ops/blade-log/pom.xml | 14 +---- blade-ops/blade-report/pom.xml | 14 +---- blade-ops/blade-resource/pom.xml | 14 +---- blade-ops/blade-swagger/pom.xml | 14 +---- .../src/main/resources/application-prod.yml | 6 +- .../src/main/resources/application-test.yml | 6 +- blade-service/blade-desk/pom.xml | 14 +---- blade-service/blade-system/pom.xml | 14 +---- doc/docker/README.md | 29 +++++----- doc/nacos/blade-prod.yaml | 6 +- doc/nacos/blade-test.yaml | 6 +- pom.xml | 55 ++++++++----------- script/docker/app/.env | 2 +- 17 files changed, 80 insertions(+), 170 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 549d1f45..2f53f982 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -120,18 +120,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 6a255238..ac70029e 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -78,18 +78,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 8965a264..0f8cb163 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -94,18 +94,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index 869562d4..437b55ac 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -72,18 +72,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index bb277b8b..07456688 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -33,18 +33,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 2f434ec7..cb440d05 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -37,18 +37,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 7cf19762..e77d9ac9 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -92,18 +92,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index cfe10759..5ebd3cdf 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -43,18 +43,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-ops/blade-swagger/src/main/resources/application-prod.yml b/blade-ops/blade-swagger/src/main/resources/application-prod.yml index 0f83d07d..d0443d50 100644 --- a/blade-ops/blade-swagger/src/main/resources/application-prod.yml +++ b/blade-ops/blade-swagger/src/main/resources/application-prod.yml @@ -2,11 +2,11 @@ knife4j: cloud: routes: - name: 授权模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-auth/v2/api-docs - name: 工作台模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-desk/v2/api-docs - name: 系统模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-system/v2/api-docs diff --git a/blade-ops/blade-swagger/src/main/resources/application-test.yml b/blade-ops/blade-swagger/src/main/resources/application-test.yml index 0f83d07d..d0443d50 100644 --- a/blade-ops/blade-swagger/src/main/resources/application-test.yml +++ b/blade-ops/blade-swagger/src/main/resources/application-test.yml @@ -2,11 +2,11 @@ knife4j: cloud: routes: - name: 授权模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-auth/v2/api-docs - name: 工作台模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-desk/v2/api-docs - name: 系统模块 - uri: 192.168.0.157:88 + uri: 192.168.0.188:88 location: /blade-system/v2/api-docs diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index abc1db91..a290c76c 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -64,18 +64,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 36b5f1e2..c7fe7169 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -42,18 +42,10 @@ - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} diff --git a/doc/docker/README.md b/doc/docker/README.md index fca904c7..b9d1222b 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -4,9 +4,9 @@ ``` - 192.168.0.157 + 192.168.0.188 admin - Harbor12345 + admin12345 smallchill@163.com @@ -14,13 +14,13 @@ - com.spotify + io.fabric8 ``` ### 2. docker开启远程访问 -如果没有远程访问,会报 `Connect to 192.168.0.157:2375 [/192.168.0.157] failed: Connection refused: connect` +如果没有远程访问,会报 `Connect to 192.168.0.188:2375 [/192.168.0.188] failed: Connection refused: connect` 在`/usr/lib/systemd/system/docker.service`,配置远程访问。主要是在[Service]这个部分，加上下面两个参数： @@ -49,7 +49,7 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock ``` { "registry-mirrors": ["https://3dse7md.mirror.aliyuncs.com"], - "insecure-registries":["192.168.0.157"] + "insecure-registries":["192.168.0.188"] } ``` @@ -59,18 +59,10 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock - com.spotify - dockerfile-maven-plugin + io.fabric8 + docker-maven-plugin - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true - - target/${project.build.finalName}.jar - - false + ${docker.fabric.skip} @@ -107,3 +99,8 @@ blade-gateway: blade_net: ipv4_address: 192.168.2.1 ``` + +### 7. 一切配置完毕，采用fabric插件命令执行构建推送： +``` +mvn clean package docker:build docker:push +``` \ No newline at end of file diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 27585df7..380df7dd 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -4,7 +4,7 @@ spring: ##redis 单机环境配置 ##将docker脚本部署的redis服务映射为宿主机ip ##生产环境推荐使用阿里云高可用redis服务并设置密码 - host: 192.168.0.157 + host: 192.168.0.188 port: 3379 password: database: 0 @@ -34,10 +34,10 @@ blade: enabled: false ##将docker脚本部署的redis服务映射为宿主机ip ##生产环境推荐使用阿里云高可用redis服务并设置密码 - address: redis://192.168.0.157:3379 + address: redis://192.168.0.188:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: prod: - url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.188:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index cb0ed5a3..448c5c83 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -3,7 +3,7 @@ spring: redis: ##redis 单机环境配置 ##将docker脚本部署的redis服务映射为宿主机ip - host: 192.168.0.157 + host: 192.168.0.188 port: 3379 password: database: 0 @@ -32,10 +32,10 @@ blade: ##是否启用分布式锁 enabled: false ##将docker脚本部署的redis服务映射为宿主机ip - address: redis://192.168.0.157:3379 + address: redis://192.168.0.188:3379 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: - url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.188:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true username: root password: root diff --git a/pom.xml b/pom.xml index 5e3eeba1..930501c7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,13 @@ UTF-8 UTF-8 - - 192.168.0.157 - http://${docker.registry.url}:2375 + + 192.168.0.188 admin - Harbor12345 + admin12345 blade - 1.4.13 + false + 0.42.0 @@ -120,29 +120,29 @@ - com.spotify - dockerfile-maven-plugin - ${docker.plugin.version} + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} - ${docker.username} - ${docker.password} - ${docker.registry.url}/${docker.namespace}/${project.artifactId} - ${project.version} - true + true + + ${docker.username} + ${docker.password} + + ${docker.registry.url} + + + ${docker.namespace}/${project.build.finalName}:${project.version} + ${project.name} + + ${project.basedir}/Dockerfile + + + - target/${project.build.finalName}.jar + ${basedir}/target/${project.build.finalName}.jar - - org.apache.maven.plugins @@ -167,13 +167,6 @@ - - com.spotify - dockerfile-maven-plugin - - true - - org.springframework.boot spring-boot-maven-plugin diff --git a/script/docker/app/.env b/script/docker/app/.env index 795c1284..c80e6720 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ -REGISTER=192.168.0.157/blade +REGISTER=192.168.0.188/blade TAG=3.1.0.RELEASE