From ead6d88abad065d5cf19d949f15c2e3f760acfd3 Mon Sep 17 00:00:00 2001 From: Preetha Appan Date: Fri, 11 May 2018 17:09:26 -0500 Subject: [PATCH] Add nil check before setting timeout on docker client --- client/driver/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index cc31e547eae3..365e0be8eb8c 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -1099,7 +1099,7 @@ func (d *DockerDriver) newDockerClient(timeout time.Duration) (*docker.Client, e } } - if timeout != 0 { + if timeout != 0 && newClient != nil { newClient.SetTimeout(timeout) } return newClient, merr.ErrorOrNil()