From e450bc736beb72b37bdb3d4a51d73b24eefaa8da Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 21 Nov 2017 16:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86docker=E9=95=9C=E5=83=8F=E5=92=8C?= =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E9=95=9C=E5=83=8F=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/docker/java/java-image-build.sh | 2 +- ms/cms/Dockerfile | 2 +- ms/cms/docker-image-build-cms.sh | 4 ++-- ms/cms/docker-run-cms.sh | 2 +- ms/config-server/Dockerfile | 2 +- .../docker-image-build-config-server.sh | 4 ++-- ms/config-server/docker-run-config-server.sh | 2 +- ms/docker-image-build-ms.sh | 9 ++++++++- ms/gateway/Dockerfile | 2 +- ms/gateway/docker-image-build-gateway.sh | 4 ++-- ms/gateway/docker-run-gateway.sh | 2 +- ms/register-center1/Dockerfile | 2 +- .../docker-image-build-register-center1.sh | 4 ++-- ms/register-center1/docker-run-register-center1.sh | 2 +- ms/register-center2/Dockerfile | 2 +- .../docker-image-build-register-center2.sh | 4 ++-- ms/register-center2/docker-run-register-center2.sh | 2 +- ms/ucenter/Dockerfile | 2 +- ms/ucenter/docker-image-build-ucenter.sh | 4 ++-- ms/ucenter/docker-run-ucenter.sh | 2 +- ms/upms/Dockerfile | 2 +- ms/upms/docker-image-build-upms.sh | 4 ++-- ms/upms/docker-run-upms.sh | 2 +- pom.xml | 13 +++++++------ 24 files changed, 44 insertions(+), 36 deletions(-) diff --git a/all/docker/java/java-image-build.sh b/all/docker/java/java-image-build.sh index 2e868b3..24bb396 100644 --- a/all/docker/java/java-image-build.sh +++ b/all/docker/java/java-image-build.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker build -t java:v0.0.1 . \ No newline at end of file +docker build -t registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 . \ No newline at end of file diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile index 658fa9a..ee4d827 100644 --- a/ms/cms/Dockerfile +++ b/ms/cms/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-cms.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/cms/docker-image-build-cms.sh b/ms/cms/docker-image-build-cms.sh index d3f8197..99f4b50 100644 --- a/ms/cms/docker-image-build-cms.sh +++ b/ms/cms/docker-image-build-cms.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-cms -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-cmsV0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/cms/docker-run-cms.sh b/ms/cms/docker-run-cms.sh index 03d36f3..7bc3078 100644 --- a/ms/cms/docker-run-cms.sh +++ b/ms/cms/docker-run-cms.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10005:10005 -p 20005:20005 ms-cms:latest java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10005:10005 -p 20005:20005 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-cmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/config-server/Dockerfile b/ms/config-server/Dockerfile index 8443200..810e542 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-config-server.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/config-server/docker-image-build-config-server.sh b/ms/config-server/docker-image-build-config-server.sh index 157f632..a4bc12f 100644 --- a/ms/config-server/docker-image-build-config-server.sh +++ b/ms/config-server/docker-image-build-config-server.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-config-server -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/config-server/docker-run-config-server.sh b/ms/config-server/docker-run-config-server.sh index 45a7564..128c45f 100644 --- a/ms/config-server/docker-run-config-server.sh +++ b/ms/config-server/docker-run-config-server.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 9999:9999 -p 19999:19999 ms-config-server:latest java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 9999:9999 -p 19999:19999 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/docker-image-build-ms.sh b/ms/docker-image-build-ms.sh index 7f00010..d551b44 100755 --- a/ms/docker-image-build-ms.sh +++ b/ms/docker-image-build-ms.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash -docker rmi -f ms-cms ms-config-server ms-gateway ms-register-center1 ms-register-center2 ms-ucenter ms-upms +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-cmsV0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT + cd cms mvn docker:build cd ../config-server/ diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile index 36ee220..42b4fc7 100644 --- a/ms/gateway/Dockerfile +++ b/ms/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-gateway.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/gateway/docker-image-build-gateway.sh b/ms/gateway/docker-image-build-gateway.sh index eea3bc9..281d4f3 100644 --- a/ms/gateway/docker-image-build-gateway.sh +++ b/ms/gateway/docker-image-build-gateway.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-gateway -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT +mvn install docker:build-Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/gateway/docker-run-gateway.sh b/ms/gateway/docker-run-gateway.sh index 42525ce..b09aa5f 100644 --- a/ms/gateway/docker-run-gateway.sh +++ b/ms/gateway/docker-run-gateway.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10007:10007 -p 20007:20007 ms-gateway:latest java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10007:10007 -p 20007:20007 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index b0770c5..65a0af9 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-register-center1.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/register-center1/docker-image-build-register-center1.sh b/ms/register-center1/docker-image-build-register-center1.sh index c3e0649..fef9d52 100644 --- a/ms/register-center1/docker-image-build-register-center1.sh +++ b/ms/register-center1/docker-image-build-register-center1.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-register-center1 -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center1/docker-run-register-center1.sh b/ms/register-center1/docker-run-register-center1.sh index d649b4f..e09187f 100644 --- a/ms/register-center1/docker-run-register-center1.sh +++ b/ms/register-center1/docker-run-register-center1.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10002:10002 -p 20002:20002 ms-register-center1:latest java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10002:10002 -p 20002:20002 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index 675dddc..a619a13 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-register-center2.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/register-center2/docker-image-build-register-center2.sh b/ms/register-center2/docker-image-build-register-center2.sh index 63613a9..25fe6c0 100644 --- a/ms/register-center2/docker-image-build-register-center2.sh +++ b/ms/register-center2/docker-image-build-register-center2.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-register-center2 -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center2/docker-run-register-center2.sh b/ms/register-center2/docker-run-register-center2.sh index 7552c8e..7db44a0 100644 --- a/ms/register-center2/docker-run-register-center2.sh +++ b/ms/register-center2/docker-run-register-center2.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10003:10003 -p 20003:20003 ms-register-center2:latest java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10003:10003 -p 20003:20003 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile index 81fb9f0..07c9a06 100644 --- a/ms/ucenter/Dockerfile +++ b/ms/ucenter/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-ucenter.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/ucenter/docker-image-build-ucenter.sh b/ms/ucenter/docker-image-build-ucenter.sh index 630fe6f..3335a5e 100644 --- a/ms/ucenter/docker-image-build-ucenter.sh +++ b/ms/ucenter/docker-image-build-ucenter.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-ucenter -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/ucenter/docker-run-ucenter.sh b/ms/ucenter/docker-run-ucenter.sh index e7c10b3..9045ff2 100644 --- a/ms/ucenter/docker-run-ucenter.sh +++ b/ms/ucenter/docker-run-ucenter.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10006:10006 -p 20006:20006 ms-ucenter:latest java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10006:10006 -p 20006:20006 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 3f280e7..3a671de 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -1,4 +1,4 @@ -FROM java:v0.0.1 +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 ADD ms-upms.jar /workhome/app.jar ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre diff --git a/ms/upms/docker-image-build-upms.sh b/ms/upms/docker-image-build-upms.sh index 0c36304..9c53d59 100644 --- a/ms/upms/docker-image-build-upms.sh +++ b/ms/upms/docker-image-build-upms.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker rmi -f ms-upms -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file +docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT +mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/upms/docker-run-upms.sh b/ms/upms/docker-run-upms.sh index afedd0d..7fa983a 100644 --- a/ms/upms/docker-run-upms.sh +++ b/ms/upms/docker-run-upms.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d -p 10004:10004 -p 20004:20004 ms-upms:latest java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10004:10004 -p 20004:20004 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8e96f0a..a98fa8f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ + registry.cn-hangzhou.aliyuncs.com/lishouyu/hub UTF-8 UTF-8 1.8 @@ -276,12 +277,12 @@ docker-maven-plugin ${docker.maven.plugin.version} - - ${project.build.finalName} - - + + ${docker.repository} + + + ${project.build.finalName}V${micro.fast.version} + ${project.basedir}