Merge branch v2.3 into master.

This commit is contained in:
Fernandez Ludovic 2020-11-08 23:46:49 +01:00
commit 520fcf82ae
53 changed files with 1203 additions and 412 deletions

View file

@ -2,6 +2,7 @@ package docker
import (
"context"
"errors"
"fmt"
"io"
"net"
@ -310,7 +311,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
startStopHandle(event)
}
case err := <-errc:
if err == io.EOF {
if errors.Is(err, io.EOF) {
logger.Debug("Provider event stream closed")
}
return err