Merge pull request #4303 from hashicorp/b-docker-client-nil-panic

Add nil check before setting timeout on docker client
hashicorp · May 22, 2018 · 0fcfaab · 0fcfaab
2 parents a0cce52 + ead6d88
commit 0fcfaab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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()