Cherry pick v1.7 into master

2018-11-19 16:40:03 +01:00 · 2018-11-19 16:40:03 +01:00 · b6498cdcbc
commit b6498cdcbc
parent a09dfa3ce1
73 changed files with 6573 additions and 186 deletions
--- a/old/provider/docker/docker.go
+++ b/old/provider/docker/docker.go
@ -212,10 +212,15 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
 						}
 						configuration := p.buildConfiguration(containers)
 						if configuration != nil {
-							configurationChan <- types.ConfigMessage{
+							message := types.ConfigMessage{
 								ProviderName:  "docker",
 								Configuration: configuration,
 							}
+							select {
+							case configurationChan <- message:
+							case <-ctx.Done():
+							}
+
 						}
 					}