From 69d473db810533b0878de68c1a78043db06ca3ef Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Wed, 22 Nov 2017 22:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=BC=BA=E5=AF=B9docker=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/docker/mysql/docker-run-mysql.sh | 1 + ms/cms/Dockerfile | 1 + ms/cms/docker-image-build-cms.sh | 4 ---- ms/config-server/Dockerfile | 1 + ms/config-server/container_settings.json | 8 -------- .../docker-image-build-config-server.sh | 4 ---- ms/docker-image-build-ms.sh | 9 --------- ms/docker-image-push-ms.sh | 16 ++++++++++++++++ ms/docker-image-remove-ms.sh | 16 ++++++++++++++++ ms/gateway/Dockerfile | 1 + ms/gateway/docker-image-build-gateway.sh | 4 ---- ms/register-center1/Dockerfile | 1 + ms/register-center1/container_settings.json | 8 -------- .../docker-image-build-register-center1.sh | 4 ---- ms/register-center2/Dockerfile | 1 + ms/register-center2/container_settings.json | 8 -------- .../docker-image-build-register-center2.sh | 4 ---- ms/ucenter/Dockerfile | 1 + ms/ucenter/docker-image-build-ucenter.sh | 4 ---- ms/upms/Dockerfile | 1 + ms/upms/container_settings.json | 8 -------- ms/upms/docker-image-build-upms.sh | 4 ---- pa/docker-image-build-pa.sh | 3 --- 23 files changed, 40 insertions(+), 72 deletions(-) create mode 100644 all/docker/mysql/docker-run-mysql.sh delete mode 100644 ms/cms/docker-image-build-cms.sh delete mode 100644 ms/config-server/container_settings.json delete mode 100644 ms/config-server/docker-image-build-config-server.sh create mode 100755 ms/docker-image-push-ms.sh create mode 100755 ms/docker-image-remove-ms.sh delete mode 100644 ms/gateway/docker-image-build-gateway.sh delete mode 100644 ms/register-center1/container_settings.json delete mode 100644 ms/register-center1/docker-image-build-register-center1.sh delete mode 100644 ms/register-center2/container_settings.json delete mode 100644 ms/register-center2/docker-image-build-register-center2.sh delete mode 100644 ms/ucenter/docker-image-build-ucenter.sh delete mode 100644 ms/upms/container_settings.json delete mode 100644 ms/upms/docker-image-build-upms.sh delete mode 100644 pa/docker-image-build-pa.sh diff --git a/all/docker/mysql/docker-run-mysql.sh b/all/docker/mysql/docker-run-mysql.sh new file mode 100644 index 0000000..f1f641a --- /dev/null +++ b/all/docker/mysql/docker-run-mysql.sh @@ -0,0 +1 @@ +#!/usr/bin/env bash diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile index 40d26a1..67b0c6c 100644 --- a/ms/cms/Dockerfile +++ b/ms/cms/Dockerfile @@ -5,4 +5,5 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10012 EXPOSE 10013 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/cms/docker-image-build-cms.sh b/ms/cms/docker-image-build-cms.sh deleted file mode 100644 index 4f11b90..0000000 --- a/ms/cms/docker-image-build-cms.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/config-server/Dockerfile b/ms/config-server/Dockerfile index 638cb7d..a32eeb9 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10000 EXPOSE 10001 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/config-server/container_settings.json b/ms/config-server/container_settings.json deleted file mode 100644 index 739f6d9..0000000 --- a/ms/config-server/container_settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/reference/api/docker_remote_api_v1.16/#create-a-container", - "AttachStdin": true, - "OpenStdin": true, - "HostConfig": { - "PortBindings":{ "10001/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "10001" }], "20001/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "20001" }] } - } -} \ No newline at end of file diff --git a/ms/config-server/docker-image-build-config-server.sh b/ms/config-server/docker-image-build-config-server.sh deleted file mode 100644 index ea26785..0000000 --- a/ms/config-server/docker-image-build-config-server.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/docker-image-build-ms.sh b/ms/docker-image-build-ms.sh index e059f3e..8e2b47e 100755 --- a/ms/docker-image-build-ms.sh +++ b/ms/docker-image-build-ms.sh @@ -1,13 +1,4 @@ #!/usr/bin/env bash -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 -docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:latest - cd cms mvn docker:build cd ../config-server/ diff --git a/ms/docker-image-push-ms.sh b/ms/docker-image-push-ms.sh new file mode 100755 index 0000000..060e7ff --- /dev/null +++ b/ms/docker-image-push-ms.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +cd cms +mvn docker:push +cd ../config-server/ +mvn docker:push +cd ../gateway/ +mvn docker:push +cd ../register-center1/ +mvn docker:push +cd ../register-center2/ +mvn docker:push +cd ../ucenter/ +mvn docker:push +cd ../upms/ +mvn docker:push + diff --git a/ms/docker-image-remove-ms.sh b/ms/docker-image-remove-ms.sh new file mode 100755 index 0000000..d846e24 --- /dev/null +++ b/ms/docker-image-remove-ms.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +cd cms +mvn docker:removeImage +cd ../config-server/ +mvn docker:removeImage +cd ../gateway/ +mvn docker:removeImage +cd ../register-center1/ +mvn docker:removeImage +cd ../register-center2/ +mvn docker:removeImage +cd ../ucenter/ +mvn docker:removeImage +cd ../upms/ +mvn docker:removeImage + diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile index 0378b51..68548df 100644 --- a/ms/gateway/Dockerfile +++ b/ms/gateway/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10006 EXPOSE 10007 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/gateway/docker-image-build-gateway.sh b/ms/gateway/docker-image-build-gateway.sh deleted file mode 100644 index d888091..0000000 --- a/ms/gateway/docker-image-build-gateway.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build-Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index b0002f6..b01cd69 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10002 EXPOSE 10003 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1"," /workhome/app.jar"] diff --git a/ms/register-center1/container_settings.json b/ms/register-center1/container_settings.json deleted file mode 100644 index de60ed7..0000000 --- a/ms/register-center1/container_settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/reference/api/docker_remote_api_v1.16/#create-a-container", - "AttachStdin": true, - "OpenStdin": true, - "HostConfig": { - "PortBindings":{ "10002/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "10002" }], "20002/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "20002" }] } - } -} \ No newline at end of file diff --git a/ms/register-center1/docker-image-build-register-center1.sh b/ms/register-center1/docker-image-build-register-center1.sh deleted file mode 100644 index 0f23faa..0000000 --- a/ms/register-center1/docker-image-build-register-center1.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index ff9e7af..a598e9d 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10004 EXPOSE 10005 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/register-center2/container_settings.json b/ms/register-center2/container_settings.json deleted file mode 100644 index c0bb127..0000000 --- a/ms/register-center2/container_settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/reference/api/docker_remote_api_v1.16/#create-a-container", - "AttachStdin": true, - "OpenStdin": true, - "HostConfig": { - "PortBindings":{ "10003/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "10003" }], "20003/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "20003" }] } - } -} \ No newline at end of file diff --git a/ms/register-center2/docker-image-build-register-center2.sh b/ms/register-center2/docker-image-build-register-center2.sh deleted file mode 100644 index 9c13bd5..0000000 --- a/ms/register-center2/docker-image-build-register-center2.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile index e61122d..4008cc7 100644 --- a/ms/ucenter/Dockerfile +++ b/ms/ucenter/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10010 EXPOSE 10011 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] \ No newline at end of file diff --git a/ms/ucenter/docker-image-build-ucenter.sh b/ms/ucenter/docker-image-build-ucenter.sh deleted file mode 100644 index 208ee6e..0000000 --- a/ms/ucenter/docker-image-build-ucenter.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -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:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 14a383e..0c0b8cd 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10008 EXPOSE 10009 +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/upms/container_settings.json b/ms/upms/container_settings.json deleted file mode 100644 index 739043a..0000000 --- a/ms/upms/container_settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/reference/api/docker_remote_api_v1.16/#create-a-container", - "AttachStdin": true, - "OpenStdin": true, - "HostConfig": { - "PortBindings":{ "10004/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "10004" }], "20004/tcp": [{ "HostIp": "0.0.0.0", "HostPort": "20004" }] } - } -} \ No newline at end of file diff --git a/ms/upms/docker-image-build-upms.sh b/ms/upms/docker-image-build-upms.sh deleted file mode 100644 index 388d3f1..0000000 --- a/ms/upms/docker-image-build-upms.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT -docker rmi -f registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:latest -mvn install docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/pa/docker-image-build-pa.sh b/pa/docker-image-build-pa.sh deleted file mode 100644 index 0813b65..0000000 --- a/pa/docker-image-build-pa.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -docker rmi -f micro-fast-pa -mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file