java_project
/
logisticsplatform
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

🎉 docker构建工具更换为fabric

pull/1/head
smallchill 2 years ago
parent
93ec1663f9
commit
a9a7a2b47b
17 changed files with 80 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      blade-auth/pom.xml
  2. 14
      blade-gateway/pom.xml
  3. 14
      blade-ops/blade-admin/pom.xml
  4. 14
      blade-ops/blade-flow/pom.xml
  5. 14
      blade-ops/blade-log/pom.xml
  6. 14
      blade-ops/blade-report/pom.xml
  7. 14
      blade-ops/blade-resource/pom.xml
  8. 14
      blade-ops/blade-swagger/pom.xml
  9. 6
      blade-ops/blade-swagger/src/main/resources/application-prod.yml
  10. 6
      blade-ops/blade-swagger/src/main/resources/application-test.yml
  11. 14
      blade-service/blade-desk/pom.xml
  12. 14
      blade-service/blade-system/pom.xml
  13. 29
      doc/docker/README.md
  14. 6
      doc/nacos/blade-prod.yaml
  15. 6
      doc/nacos/blade-test.yaml
  16. 55
      pom.xml
  17. 2
      script/docker/app/.env

14
blade-auth/pom.xml
Unescape View File

@ -120,18 +120,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-gateway/pom.xml
Unescape View File

@ -78,18 +78,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-admin/pom.xml
Unescape View File

@ -94,18 +94,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-flow/pom.xml
Unescape View File

@ -72,18 +72,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-log/pom.xml
Unescape View File

@ -33,18 +33,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-report/pom.xml
Unescape View File

@ -37,18 +37,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-resource/pom.xml
Unescape View File

@ -92,18 +92,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-ops/blade-swagger/pom.xml
Unescape View File

@ -43,18 +43,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

6
blade-ops/blade-swagger/src/main/resources/application-prod.yml
Unescape View File

@ -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

6
blade-ops/blade-swagger/src/main/resources/application-test.yml
Unescape View File

@ -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

14
blade-service/blade-desk/pom.xml
Unescape View File

@ -64,18 +64,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

14
blade-service/blade-system/pom.xml
Unescape View File

@ -42,18 +42,10 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
<plugin>

29
doc/docker/README.md
Unescape View File

@ -4,9 +4,9 @@
```
<servers>
<server>
<id>192.168.0.157</id>
<id>192.168.0.188</id>
<username>admin</username>
<password>Harbor12345</password>
<password>admin12345</password>
<configuration>
<email>smallchill@163.com</email>
</configuration>
@ -14,13 +14,13 @@
</servers>
<pluginGroups>
<pluginGroup>com.spotify</pluginGroup>
<pluginGroup>io.fabric8</pluginGroup>
</pluginGroups>
```
### 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
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
<skip>false</skip>
<skip>${docker.fabric.skip}</skip>
</configuration>
</plugin>
</plugins>
@ -107,3 +99,8 @@ blade-gateway:
blade_net:
ipv4_address: 192.168.2.1
```
### 7. 一切配置完毕，采用fabric插件命令执行构建推送：
```
mvn clean package docker:build docker:push
```

6
doc/nacos/blade-prod.yaml
Unescape View File

@ -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

6
doc/nacos/blade-test.yaml
Unescape View File

@ -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

55
pom.xml
Unescape View File

@ -16,13 +16,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- 推荐使用Harbor -->
<docker.registry.url>192.168.0.157</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<!-- Docker仓库服务配置 -->
<docker.registry.url>192.168.0.188</docker.registry.url>
<docker.username>admin</docker.username>
<docker.password>Harbor12345</docker.password>
<docker.password>admin12345</docker.password>
<docker.namespace>blade</docker.namespace>
<docker.plugin.version>1.4.13</docker.plugin.version>
<docker.fabric.skip>false</docker.fabric.skip>
<docker.fabric.version>0.42.0</docker.fabric.version>
</properties>
<modules>
@ -120,29 +120,29 @@
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${docker.plugin.version}</version>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.fabric.version}</version>
<configuration>
<username>${docker.username}</username>
<password>${docker.password}</password>
<repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
<tag>${project.version}</tag>
<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
<skip>true</skip>
<authConfig>
<username>${docker.username}</username>
<password>${docker.password}</password>
</authConfig>
<registry>${docker.registry.url}</registry>
<images>
<image>
<name>${docker.namespace}/${project.build.finalName}:${project.version}</name>
<alias>${project.name}</alias>
<build>
<dockerFile>${project.basedir}/Dockerfile</dockerFile>
</build>
</image>
</images>
<buildArgs>
<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
<JAR_FILE>${basedir}/target/${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
</configuration>
<!--子服务添加如下配置，运行 mvn deploy 命令便会自动打包镜像-->
<!--<executions>
<execution>
<id>default</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -167,13 +167,6 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>

2
script/docker/app/.env
Unescape View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
REGISTER=192.168.0.188/blade
TAG=3.1.0.RELEASE

Write Preview
Loading…
Cancel
Save