From 478564c701a2375474bf460f2817b2da1570c844 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Mon, 20 Nov 2017 23:05:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8docker?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/docker/java/Dockerfile | 2 +- ms/cms/Dockerfile | 1 + ms/cms/docker-run-cms.sh | 2 ++ ms/config-server/docker-run-config-server.sh | 2 ++ ms/config-server/src/main/resources/bootstrap.yml | 8 +++++--- ms/gateway/docker-run-gateway.sh | 2 ++ ms/register-center1/docker-run-register-center1.sh | 2 ++ ms/register-center1/src/main/resources/bootstrap.yml | 3 ++- ms/register-center2/docker-run-register-center2.sh | 2 ++ ms/register-center2/src/main/resources/bootstrap.yml | 2 +- ms/ucenter/docker-run-ucenter.sh | 2 ++ ms/upms/docker-run-upms.sh | 2 ++ 12 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 ms/cms/docker-run-cms.sh create mode 100644 ms/config-server/docker-run-config-server.sh create mode 100644 ms/gateway/docker-run-gateway.sh create mode 100644 ms/register-center1/docker-run-register-center1.sh create mode 100644 ms/register-center2/docker-run-register-center2.sh create mode 100644 ms/ucenter/docker-run-ucenter.sh create mode 100644 ms/upms/docker-run-upms.sh diff --git a/all/docker/java/Dockerfile b/all/docker/java/Dockerfile index 613215c..7832220 100644 --- a/all/docker/java/Dockerfile +++ b/all/docker/java/Dockerfile @@ -5,7 +5,7 @@ WORKDIR / RUN mkdir workhome WORKDIR /opt RUN mkdir lib -ADD ./jdk1.8.0_144 /opt/lib/ +ADD ./jdk1.8.0_144 /opt/lib/jdk1.8.0_144/ RUN echo "export JAVA_HOME=/opt/lib/jdk1.8.0_144" >> /etc/profile RUN echo "export JAVA_JRE=\${JAVA_HOME}/jre" >> /etc/profile RUN echo "export PATH=\${JAVA_HOME}/bin:\$PATH" >> /etc/profile diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile index 5c0506b..658fa9a 100644 --- a/ms/cms/Dockerfile +++ b/ms/cms/Dockerfile @@ -5,3 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10005 EXPOSE 20005 + diff --git a/ms/cms/docker-run-cms.sh b/ms/cms/docker-run-cms.sh new file mode 100644 index 0000000..2eee109 --- /dev/null +++ b/ms/cms/docker-run-cms.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10005:10005 -p 20005:20005 ms-cms:latest java -jar -Dregister.server.ip=192.168.43.42 /workhome/app.jar \ 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 new file mode 100644 index 0000000..31942dd --- /dev/null +++ b/ms/config-server/docker-run-config-server.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 9999:9999 -p 19999:19999 ms-config-server:latest java -jar -Dregister.server.ip=192.168.43.42 /workhome/app.jar \ No newline at end of file diff --git a/ms/config-server/src/main/resources/bootstrap.yml b/ms/config-server/src/main/resources/bootstrap.yml index 2ad114e..a797dbf 100644 --- a/ms/config-server/src/main/resources/bootstrap.yml +++ b/ms/config-server/src/main/resources/bootstrap.yml @@ -1,5 +1,7 @@ #自定义参数,用于命令行替换，默认值是127.0.0.1 -register.ip: 127.0.0.1 +register: + server: + ip: 127.0.0.1 # 程序实例的配置，git仓库的配置 spring: application: @@ -14,6 +16,6 @@ spring: eureka: client: service-url: - defaultZone: http://micro:fast@${register.ip}:10002/eureka/,http://micro:fast@${register.ip}:10003/eureka/ #配置所有的注册中心 + defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10003/eureka/ #配置所有的注册中心 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true diff --git a/ms/gateway/docker-run-gateway.sh b/ms/gateway/docker-run-gateway.sh new file mode 100644 index 0000000..033398e --- /dev/null +++ b/ms/gateway/docker-run-gateway.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10007:10007 -p 20007:20007 ms-gateway:latest java -jar -Dregister.server.ip=192.168.43.42 /workhome/app.jar \ 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 new file mode 100644 index 0000000..d349a01 --- /dev/null +++ b/ms/register-center1/docker-run-register-center1.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10002:10002 -p 20002:20002 ms-register-center1:latest java -jar -Dregister.server.ip=192.168.43.42 -Dconfig.server.ip=192.168.43.42 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center1/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml index f5dbdad..d7fe2fc 100644 --- a/ms/register-center1/src/main/resources/bootstrap.yml +++ b/ms/register-center1/src/main/resources/bootstrap.yml @@ -18,4 +18,5 @@ eureka: service-url: defaultZone: http://micro:fast@${register.server.ip}:10003/eureka #和其他注册中心连接 instance: - prefer-ip-address: true \ No newline at end of file + prefer-ip-address: true + ip-address: 192.168.43.42 \ 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 new file mode 100644 index 0000000..db6cafa --- /dev/null +++ b/ms/register-center2/docker-run-register-center2.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10003:10003 -p 20003:20003 ms-register-center2:latest java -jar -Dregister.server.ip=192.168.43.42 -Dconfig.server.ip=192.168.43.42 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center2/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml index fea02ca..7133efb 100644 --- a/ms/register-center2/src/main/resources/bootstrap.yml +++ b/ms/register-center2/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ #自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 127.0.0.1 + ip: 127.0.0.1 config: server: ip: 127.0.0.1 diff --git a/ms/ucenter/docker-run-ucenter.sh b/ms/ucenter/docker-run-ucenter.sh new file mode 100644 index 0000000..cc5d529 --- /dev/null +++ b/ms/ucenter/docker-run-ucenter.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10006:10006 -p 20006:20006 ms-ucenter:latest java -jar -Dregister.server.ip=192.168.43.42 /workhome/app.jar \ No newline at end of file diff --git a/ms/upms/docker-run-upms.sh b/ms/upms/docker-run-upms.sh new file mode 100644 index 0000000..ec6ac44 --- /dev/null +++ b/ms/upms/docker-run-upms.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker run -d -p 10004:10004 -p 20004:20004 ms-upms:latest java -jar -Dregister.server.ip=192.168.43.42 /workhome/app.jar \ No newline at end of file