Fix default value of docker client timeout

This commit is contained in:
Kevin Pollet
2020-09-25 09:14:04 +02:00
committed by GitHub
parent 050968cbac
commit 5e63ab619e
5 changed files with 6 additions and 7 deletions

View File

@@ -213,8 +213,8 @@ func (c *Configuration) SetEffectiveConfiguration() {
c.Providers.Docker.SwarmModeRefreshSeconds = ptypes.Duration(15 * time.Second)
}
if c.Providers.Docker.HTTPClientTimeout <= 0 {
c.Providers.Docker.HTTPClientTimeout = ptypes.Duration(32 * time.Second)
if c.Providers.Docker.HTTPClientTimeout < 0 {
c.Providers.Docker.HTTPClientTimeout = 0
}
}

View File

@@ -68,7 +68,6 @@ func (p *Provider) SetDefaults() {
p.Endpoint = "unix:///var/run/docker.sock"
p.SwarmMode = false
p.SwarmModeRefreshSeconds = ptypes.Duration(15 * time.Second)
p.HTTPClientTimeout = ptypes.Duration(32 * time.Second)
p.DefaultRule = DefaultTemplateRule
}