From f6ffe62931acf20712a4c2d9a7f59b6f1dbc08cb Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 14 Jun 2018 16:18:14 +0900 Subject: [PATCH] ing --- Dockerfile | 4 +--- _docker/config/config.json | 14 ++++++++++---- build.sh | 4 ++-- config.json | 4 ++-- docker-compose.yml | 11 ++++++----- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4434c50..60b8e95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,7 @@ COPY _docker/config/* /etc/overflow/config/ COPY _docker/bin/* /usr/local/overflow/bin/ COPY dist/probe_gateway_metric /usr/local/overflow/bin/ -RUN mkdir -p /etc/overflow/config; \ - mkdir -p /usr/local/overflow/bin; \ - mkdir -p /var/overflow/logs; \ +RUN mkdir -p /var/overflow/logs; \ chmod +x /usr/local/overflow/bin/docker-entrypoint.sh /usr/local/overflow/bin/probe_gateway_metric; ENV TINI_VERSION='0.17.0' diff --git a/_docker/config/config.json b/_docker/config/config.json index 188822e..d735d5a 100644 --- a/_docker/config/config.json +++ b/_docker/config/config.json @@ -19,11 +19,17 @@ "external": { "grpc": { "network": "tcp4", - "address": "192.168.1.50:50006" + "address": "central:9111" }, - "redis": { - "network": "tcp4", - "address": "192.168.1.50:6379" + "kafka": { + "producers": { + "metric": { + "brokers": [ + "kafka1:9092" + ], + "topic": "overflow-metric-topic" + } + } } } } diff --git a/build.sh b/build.sh index 1177ccc..f67fd29 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,6 @@ rm ./dist CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o ./dist/probe_gateway_metric -docker build -t docker.loafle.net/overflow/probe_gateway_metric:1.0.0 . +docker build -t docker.loafle.net/overflow/probe_gateway_metric:1.0.0-SNAPSHOT . -docker push docker.loafle.net/overflow/probe_gateway_metric:1.0.0 \ No newline at end of file +docker push docker.loafle.net/overflow/probe_gateway_metric:1.0.0-SNAPSHOT \ No newline at end of file diff --git a/config.json b/config.json index 43e31bd..8b8f0e5 100644 --- a/config.json +++ b/config.json @@ -2,7 +2,7 @@ "serverHandler": { "name": "Gateway Probe Metric", "network": "tcp4", - "address": ":19095", + "address": ":19110", "concurrency": 262144, "keepAlive": 60, "handshakeTimeout": 60, @@ -19,7 +19,7 @@ "external": { "grpc": { "network": "tcp4", - "address": "192.168.1.50:50006" + "address": "192.168.1.101:9111" }, "kafka": { "producers": { diff --git a/docker-compose.yml b/docker-compose.yml index 39a6909..3a582b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,11 @@ version: "3" services: probe_gateway_metric: - image: docker.loafle.net/overflow/probe_gateway_metric:1.0.0 + image: docker.loafle.net/overflow/probe_gateway_metric:1.0.0-SNAPSHOT container_name: probe_gateway_metric - # volumes: - # - /service/redis/data/var/redis:/data - # - /service/redis/data/usr/local/etc/redis/redis.conf:/usr/local/etc/redis/redis.conf + hostname: probe_gateway_metric + restart: always + volumes: + - /service/overflow/data/probe_gateway_metric/opt/conf:/opt/conf ports: - - "19095:80" \ No newline at end of file + - 19110:80 \ No newline at end of file