Merge branch 'v1.7' into master

2018-08-28 15:50:00 +02:00 · 2018-08-28 15:50:00 +02:00 · 4055654e9b
commit 4055654e9b
parent 00728e711c 56488d435f
63 changed files with 2687 additions and 852 deletions
--- a/provider/ecs/ecs.go
+++ b/provider/ecs/ecs.go
@ -45,6 +45,8 @@ type ecsInstance struct {
 	containerDefinition *ecs.ContainerDefinition
 	machine             *machine
 	TraefikLabels       map[string]string
+	SegmentLabels       map[string]string
+	SegmentName         string
 }

 type portMapping struct {