From 33a9a639272c4b4e78e8d1fbeb803ff096939470 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 17 May 2019 10:34:53 +0100 Subject: [PATCH] Revert "add a 10s timeout to the client object." This reverts commit 59defcb34d5be358ebaacaadd21ed7e6307a493e which caused #1892 since the timeout applied not only to the dial phase but to everything, so it would kill `docker logs -f ...` if the container was not chatty enough. Signed-off-by: Ian Campbell --- cli/context/docker/load.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go index 8de36b4a25..b7288bd1d4 100644 --- a/cli/context/docker/load.go +++ b/cli/context/docker/load.go @@ -122,7 +122,6 @@ 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")