From 64d0aa8b3d064db82ba79a6204765f8660f6eb2a Mon Sep 17 00:00:00 2001 From: Aleksander Cynarski Date: Sun, 16 Dec 2018 13:09:43 +0100 Subject: [PATCH] Ignore --- .gitignore | 1 + docker-compose.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ecdc809..ea50b05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tags storage +influxdb/ diff --git a/docker-compose.yml b/docker-compose.yml index 38d4ec5..7378106 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,12 +23,13 @@ services: depends_on: - consul image: gliderlabs/registrator:master - command: -internal consul://consul:8500 + command: -ttl=120 -ttl-refresh=10 -cleanup=true -resync=10 -internal consul://consul:8500 volumes: - /var/run/docker.sock:/tmp/docker.sock links: - consul environment: + SERVICE_NAME: registrator portainer: @@ -38,7 +39,7 @@ services: command: -H unix:///var/run/docker.sock volumes: - /var/run/docker.sock:/var/run/docker.sock - - portainer_data:/data + - ./storage/portainer:/data fluentd: build: ./fluentd @@ -51,8 +52,10 @@ services: ports: - 24224:24224 environment: - SERVICE_24224_NAME: 'fluentd' - SERVICE_5140_NAME: 'fluentd' + SERVICE_24224_NAME: 'myenv' + SERVICE_24224_TAG: 'udp' + SERVICE_5140_NAME: 'myenv' + SERVICE_TAG: 'fluent' influxdb: image: influxdb:latest @@ -65,6 +68,3 @@ services: INFLUXDB_REPORTING_DISABLED: 'false' SERVICE_8086_NAME: 'influxdb' - -volumes: - portainer_data: