From 6392c57aec008c21be54bcf53392387f51443e3e Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Sun, 15 Oct 2017 21:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=B9docker=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...age-build.sh => docker-image-build-cms.sh} |  0
 ...sh => docker-image-build-config-server.sh} |  0
 ms/docker-image-build-ms.sh                   | 17 ++++++++++++++
 ...build.sh => docker-image-build-gateway.sh} |  0
 ms/ms-docker-image-build.sh                   | 23 -------------------
 ...=> docker-image-build-register-center1.sh} |  0
 ...=> docker-image-build-register-center2.sh} |  0
 ...build.sh => docker-image-build-ucenter.sh} |  0
 ...ge-build.sh => docker-image-build-upms.sh} |  0
 ...mage-build.sh => docker-image-build-pa.sh} |  0
 pom.xml                                       |  7 ++++++
 11 files changed, 24 insertions(+), 23 deletions(-)
 rename ms/cms/{docker-image-build.sh => docker-image-build-cms.sh} (100%)
 mode change 100755 => 100644
 rename ms/config-server/{docker-image-build.sh => docker-image-build-config-server.sh} (100%)
 create mode 100755 ms/docker-image-build-ms.sh
 rename ms/gateway/{docker-image-build.sh => docker-image-build-gateway.sh} (100%)
 delete mode 100755 ms/ms-docker-image-build.sh
 rename ms/register-center1/{docker-image-build.sh => docker-image-build-register-center1.sh} (100%)
 rename ms/register-center2/{docker-image-build.sh => docker-image-build-register-center2.sh} (100%)
 rename ms/ucenter/{docker-image-build.sh => docker-image-build-ucenter.sh} (100%)
 rename ms/upms/{docker-image-build.sh => docker-image-build-upms.sh} (100%)
 rename pa/{pa-docker-image-build.sh => docker-image-build-pa.sh} (100%)

diff --git a/ms/cms/docker-image-build.sh b/ms/cms/docker-image-build-cms.sh
old mode 100755
new mode 100644
similarity index 100%
rename from ms/cms/docker-image-build.sh
rename to ms/cms/docker-image-build-cms.sh
diff --git a/ms/config-server/docker-image-build.sh b/ms/config-server/docker-image-build-config-server.sh
similarity index 100%
rename from ms/config-server/docker-image-build.sh
rename to ms/config-server/docker-image-build-config-server.sh
diff --git a/ms/docker-image-build-ms.sh b/ms/docker-image-build-ms.sh
new file mode 100755
index 0000000..944f319
--- /dev/null
+++ b/ms/docker-image-build-ms.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+docker rmi -f ms-cms ms-config-server ms-gateway ms-register-center1 ms-register-center2 ms-ucenter ms-upms
+cd cms
+mvn package docker:build -Dmaven.test.skip=true
+cd ../config-server/
+mvn package docker:build -Dmaven.test.skip=true
+cd ../gateway/
+mvn package docker:build -Dmaven.test.skip=true
+cd ../register-center1/
+mvn package docker:build -Dmaven.test.skip=true
+cd ../register-center2/
+mvn package docker:build -Dmaven.test.skip=true
+cd ../ucenter/
+mvn package docker:build -Dmaven.test.skip=true
+cd ../upms/
+mvn package docker:build -Dmaven.test.skip=true
+
diff --git a/ms/gateway/docker-image-build.sh b/ms/gateway/docker-image-build-gateway.sh
similarity index 100%
rename from ms/gateway/docker-image-build.sh
rename to ms/gateway/docker-image-build-gateway.sh
diff --git a/ms/ms-docker-image-build.sh b/ms/ms-docker-image-build.sh
deleted file mode 100755
index 6aae679..0000000
--- a/ms/ms-docker-image-build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-cd cms
-source ms-docker-image-build.sh
-
-cd ../config-server/
-source ms-docker-image-build.sh
-
-cd ../gateway/
-source ms-docker-image-build.sh
-
-cd ../register-center1/
-source ms-docker-image-build.sh
-
-cd ../register-center2/
-source ms-docker-image-build.sh
-
-cd ../ucenter/
-source ms-docker-image-build.sh
-
-cd ../upms/
-source ms-docker-image-build.sh
-
diff --git a/ms/register-center1/docker-image-build.sh b/ms/register-center1/docker-image-build-register-center1.sh
similarity index 100%
rename from ms/register-center1/docker-image-build.sh
rename to ms/register-center1/docker-image-build-register-center1.sh
diff --git a/ms/register-center2/docker-image-build.sh b/ms/register-center2/docker-image-build-register-center2.sh
similarity index 100%
rename from ms/register-center2/docker-image-build.sh
rename to ms/register-center2/docker-image-build-register-center2.sh
diff --git a/ms/ucenter/docker-image-build.sh b/ms/ucenter/docker-image-build-ucenter.sh
similarity index 100%
rename from ms/ucenter/docker-image-build.sh
rename to ms/ucenter/docker-image-build-ucenter.sh
diff --git a/ms/upms/docker-image-build.sh b/ms/upms/docker-image-build-upms.sh
similarity index 100%
rename from ms/upms/docker-image-build.sh
rename to ms/upms/docker-image-build-upms.sh
diff --git a/pa/pa-docker-image-build.sh b/pa/docker-image-build-pa.sh
similarity index 100%
rename from pa/pa-docker-image-build.sh
rename to pa/docker-image-build-pa.sh
diff --git a/pom.xml b/pom.xml
index 3158c88..a84c862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,8 +277,15 @@
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${docker.maven.plugin.version}</version>
                     <configuration>
+                        <!--设置镜像的名字为maven构建的jar的名字-->
                         <imageName>${project.build.finalName}</imageName>
+                        <!--设置镜像的tag为项目的版本号-->
+                        <!--<imageTags>
+                            <imageTag>${micro.fast.version}</imageTag>
+                        </imageTags>-->
+                        <!--存放Dockerfile的文件夹-->
                         <dockerDirectory>${project.basedir}</dockerDirectory>
+                        <!--构建镜像所有的资源，这些资源将被复制到dockerFile的目录-->
                         <resources>
                             <resource>
                                 <targetPath>/</targetPath>