From 3e71a17d6756c70e12d1ff5bec0803e0c5de377b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Wed, 25 Jul 2018 10:24:08 +0800 Subject: [PATCH] =?UTF-8?q?:whale:=20=E8=B0=83=E6=95=B4docker-compose?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 12 +++++++++++- pigx-visual/pigx-daemon/Dockerfile | 2 +- pigx-visual/pigx-monitor/Dockerfile | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7c71737cc..f40895a71 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,17 @@ services: - pigx-eureka build: context: ./ - dockerfile: ./pigx-daemon/Dockerfile + dockerfile: ./pigx-visual/pigx-monitor/Dockerfile restart: always ports: - 5001:5001 + + pig-daemon: + links: + - pigx-eureka + build: + context: ./ + dockerfile: ./pigx-visual/pigx-daemon/Dockerfile + restart: always + ports: + - 5002:5002 diff --git a/pigx-visual/pigx-daemon/Dockerfile b/pigx-visual/pigx-daemon/Dockerfile index c7bb7045e..a442fde69 100644 --- a/pigx-visual/pigx-daemon/Dockerfile +++ b/pigx-visual/pigx-daemon/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-daemon EXPOSE 5002 -ADD ./pigx-daemon/target/pigx-daemon.jar ./ +ADD ./pigx-visual/pigx-daemon/target/pigx-daemon.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon.jar diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile index bcf5d4080..09feb12a2 100644 --- a/pigx-visual/pigx-monitor/Dockerfile +++ b/pigx-visual/pigx-monitor/Dockerfile @@ -2,12 +2,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER wangiegie@gmail.com -RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-daemon +RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-monitor -WORKDIR /pigx/bin/com.pig4cloud/pigx-daemon +WORKDIR /pigx/bin/com.pig4cloud/pigx-monitor EXPOSE 5001 -ADD ./pigx-daemon/target/pigx-daemon.jar ./ +ADD ./pigx-visual/pigx-monitor/target/pigx-monitor.jar ./ -CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon.jar +CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar