Revert "Merge v1.4.2 into master"

2017-11-15 18:18:03 +01:00
parent 6fcab72ec7
commit 0c702b0b6b
18 changed files with 145 additions and 717 deletions
--- a/integration/resources/compose/consul_catalog.yml
+++ b/integration/resources/compose/consul_catalog.yml
@@ -1,6 +1,6 @@
 consul:
-  image: consul
-  command: agent -server -bootstrap-expect 1 -client 0.0.0.0 -log-level debug -ui
+  image: progrium/consul
+  command: -server -bootstrap -log-level debug -ui-dir /ui
  ports:
    - "8400:8400"
    - "8500:8500"
@@ -15,5 +15,3 @@ nginx1:
  image: nginx:alpine
 nginx2:
  image: nginx:alpine
-nginx3:
-  image: nginx:alpine