add a 10s timeout to the client object.

Ian Campbell · Ian Campbell · commit 59defcb34d5b · 2019-05-13T13:53:03.000+01:00
This partially mitigates docker#1739 ("Docker commands take 1 minute to timeout if context endpoint is unreachable") and is a simpler alternative to docker#1747 (which completely defers the client connection until an actual call is attempted). Note that the previous 60s delay was the culmination of two separate 30s timeouts since the ping is tried twice. This with this patch the overall timeout is 20s. moby/moby#39206 will remove the second ping and once that propagates to this tree the timeout will be 10s. Signed-off-by: Ian Campbell <ijc@docker.com>
diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go
@@ -122,6 +122,7 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) {
 				client.WithDialContext(helper.Dialer),
 			)
 		}
+		result = append(result, client.WithTimeout(10*time.Second))
 	}
 
 	version := os.Getenv("DOCKER_API_VERSION")

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) {`
`122`	`122`	`client.WithDialContext(helper.Dialer),`
`123`	`123`	`)`
`124`	`124`	`}`
	`125`	`+ result = append(result, client.WithTimeout(10*time.Second))`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`version := os.Getenv("DOCKER_API_VERSION")`