1
0
Fork 0

Merge v1.4.2 into master

This commit is contained in:
Ludovic Fernandez 2017-11-14 16:48:03 +01:00 committed by Traefiker
parent d55115844a
commit 6fcab72ec7
18 changed files with 717 additions and 145 deletions

View file

@ -1,6 +1,6 @@
consul:
image: progrium/consul
command: -server -bootstrap -log-level debug -ui-dir /ui
image: consul
command: agent -server -bootstrap-expect 1 -client 0.0.0.0 -log-level debug -ui
ports:
- "8400:8400"
- "8500:8500"
@ -15,3 +15,5 @@ nginx1:
image: nginx:alpine
nginx2:
image: nginx:alpine
nginx3:
image: nginx:alpine