diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index ca2e1b69..5ff12dd2 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -114,43 +114,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-common/pom.xml b/blade-common/pom.xml index a7e6e17b..24794692 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -36,14 +36,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index e97b9df4..2b4c8edb 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -111,43 +111,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index e9596e5a..6a323d07 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -46,14 +46,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 08329f2a..a5970ecd 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -49,43 +49,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index c3fc55ed..560d7b75 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -43,33 +43,9 @@ - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 803aef25..ff5fd9c7 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -95,43 +95,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index 309db305..704dc2a3 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -74,43 +74,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index 38093ff9..6ade2f14 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -34,43 +34,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index da48bab4..bd7bbe0e 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -51,43 +51,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml index 52e6963e..68a7f999 100644 --- a/blade-ops/blade-turbine/pom.xml +++ b/blade-ops/blade-turbine/pom.xml @@ -56,43 +56,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index 1323ad29..29bf5959 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -93,43 +93,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index 4b8a83e4..6171139b 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -38,43 +38,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml index a0ffed4b..759beb58 100644 --- a/blade-ops/blade-zipkin/pom.xml +++ b/blade-ops/blade-zipkin/pom.xml @@ -55,43 +55,22 @@ com.spotify - docker-maven-plugin - ${docker.plugin.version} + dockerfile-maven-plugin - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index ee4911bd..8d41404c 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -67,14 +67,6 @@ ${project.name} - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index ca90c8ce..137cd5df 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -56,25 +56,24 @@ + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 5f36e53b..b8e08f53 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -37,25 +37,24 @@ + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index eba06aa3..308392cf 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -42,25 +42,24 @@ + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + org.apache.maven.plugins maven-antrun-plugin - - - package - - run - - - - - - - - - diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 02b6b4de..8eb02f4f 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -44,29 +44,4 @@ - - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true - - - - - diff --git a/doc/docker/README.md b/doc/docker/README.md index 9d570dd8..ffbac5da 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -1,5 +1,5 @@ #使用docker构建工程步骤 -###1. 使用docker-harbor作为私有库,需要配置maven,找到setting.xml( `linux可以使用find / -name settings.xml`)加入以下配置 +### 1. 使用harbor作为私有库,需要配置maven,找到setting.xml( `linux可以使用find / -name settings.xml`)加入以下配置 ``` @@ -18,7 +18,7 @@ ``` -###2. docker开启远程访问 +### 2. docker开启远程访问 如果没有远程访问,会报 `Connect to 192.168.0.157:2375 [/192.168.0.157] failed: Connection refused: connect` @@ -33,38 +33,51 @@ ExecStart= ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock ``` +### 3. 配置http访问 +因为docker1.3.2版本开始默认docker registry使用的是https，我们设置Harbor默认http方式，所以当执行用docker login、pull、push等命令操作非https的docker regsitry的时就会报错。 +解决办法：配置`/etc/docker/daemon.json` +``` +[root@localhost harbor]# vi /etc/docker/daemon.json +{ + "registry-mirrors": ["https://3dse7md.mirror.aliyuncs.com"] +} +``` + +将其修改为： + +``` +{ + "registry-mirrors": ["https://3dse7md.mirror.aliyuncs.com"], + "insecure-registries":["192.168.0.157"] +} +``` -###3. 在每个需要构建子项目的pom.xml下加入配置,内容可参考如下 +### 4. 在每个需要构建子项目的pom.xml下加入配置,内容可参考如下 ``` - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - ${docker.registry.url}/blade/${project.artifactId}:${project.version} - ${project.basedir} - ${docker.registry.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - ${docker.registry.url} - ${docker.registry.url} - true - + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + ``` -###4. 在每个需要构建子项目的根目录下加入Dockerfile,内容可参考如下 +### 5. 在每个需要构建子项目的根目录下加入Dockerfile,内容可参考如下 ``` FROM anapsix/alpine-java:8_server-jre_unlimited @@ -83,7 +96,7 @@ CMD java -Djava.security.egd=file:/dev/./urandom -jar app.jar --spring.profiles. ``` -###5. 在工程根目录的docker-compose.yml下加入配置，内容可参考如下 +### 6. 在工程根目录的docker-compose.yml下加入配置，内容可参考如下 ``` blade-gateway: image: "${REGISTER}/blade/blade-gateway:${TAG}" diff --git a/pom.xml b/pom.xml index d95bd265..0383fe72 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,10 @@ 192.168.0.157 http://${docker.registry.url}:2375 - 1.1.0 + admin + Harbor12345 + blade + 1.4.13 @@ -115,9 +118,61 @@ + + com.spotify + dockerfile-maven-plugin + ${docker.plugin.version} + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + package + + run + + + + + + + + + + + + com.spotify + dockerfile-maven-plugin + + true + + org.springframework.boot spring-boot-maven-plugin