Traefik #1

Merged
paramah merged 4 commits from develop into master 2020-10-05 16:13:54 +00:00
2 changed files with 8 additions and 7 deletions
Showing only changes of commit 64d0aa8b3d - Show all commits

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
tags tags
storage storage
influxdb/

View File

@ -23,12 +23,13 @@ services:
depends_on: depends_on:
- consul - consul
image: gliderlabs/registrator:master image: gliderlabs/registrator:master
command: -internal consul://consul:8500 command: -ttl=120 -ttl-refresh=10 -cleanup=true -resync=10 -internal consul://consul:8500
volumes: volumes:
- /var/run/docker.sock:/tmp/docker.sock - /var/run/docker.sock:/tmp/docker.sock
links: links:
- consul - consul
environment: environment:
SERVICE_NAME: registrator SERVICE_NAME: registrator
portainer: portainer:
@ -38,7 +39,7 @@ services:
command: -H unix:///var/run/docker.sock command: -H unix:///var/run/docker.sock
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- portainer_data:/data - ./storage/portainer:/data
fluentd: fluentd:
build: ./fluentd build: ./fluentd
@ -51,8 +52,10 @@ services:
ports: ports:
- 24224:24224 - 24224:24224
environment: environment:
SERVICE_24224_NAME: 'fluentd' SERVICE_24224_NAME: 'myenv'
SERVICE_5140_NAME: 'fluentd' SERVICE_24224_TAG: 'udp'
SERVICE_5140_NAME: 'myenv'
SERVICE_TAG: 'fluent'
influxdb: influxdb:
image: influxdb:latest image: influxdb:latest
@ -65,6 +68,3 @@ services:
INFLUXDB_REPORTING_DISABLED: 'false' INFLUXDB_REPORTING_DISABLED: 'false'
SERVICE_8086_NAME: 'influxdb' SERVICE_8086_NAME: 'influxdb'
volumes:
portainer_data: