Merge branch 'v2.1' into master

2019-12-03 10:43:25 +01:00
parent 9b9f4be6a4 bc063ad773
commit 829649e905
73 changed files with 1497 additions and 517 deletions
--- a/integration/resources/compose/consul_catalog.yml
+++ b/integration/resources/compose/consul_catalog.yml
@@ -1,7 +1,15 @@
 consul:
-  image: consul:1.6.1
+  image: consul:1.6.2
  ports:
    - 8500:8500
+  command: "agent -server -bootstrap -ui -client 0.0.0.0"
+consul-agent:
+  image: consul:1.6.2
+  ports:
+    - 8501:8500
+  command: "agent -retry-join consul -client 0.0.0.0"
+  links:
+    - consul
 whoami1:
  image: containous/whoami:v1.3.0
  hostname: whoami1