Merge pull request #1335 from hashicorp/f-set-docker-timeout

Setting a timeout in the docker client
hashicorp · Jun 22, 2016 · 964e133 · 964e133
2 parents e73463a + f385e33
commit 964e133
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -264,11 +264,25 @@ func (d *DockerDriver) dockerClients() (*docker.Client, *docker.Client, error) {
 			if cert+key+ca != "" {
 				d.logger.Printf("[DEBUG] driver.docker: using TLS client connection to %s", dockerEndpoint)
 				client, err = docker.NewTLSClient(dockerEndpoint, cert, key, ca)
+				if err != nil {
+					merr.Errors = append(merr.Errors, err)
+				}
+				waitClient, err = docker.NewTLSClient(dockerEndpoint, cert, key, ca)
+				if err != nil {
+					merr.Errors = append(merr.Errors, err)
+				}
 			} else {
 				d.logger.Printf("[DEBUG] driver.docker: using standard client connection to %s", dockerEndpoint)
 				client, err = docker.NewClient(dockerEndpoint)
+				if err != nil {
+					merr.Errors = append(merr.Errors, err)
+				}
+				waitClient, err = docker.NewClient(dockerEndpoint)
+				if err != nil {
+					merr.Errors = append(merr.Errors, err)
+				}
 			}
-			client.HTTPClient.Timeout = dockerTimeout
+			client.SetTimeout(dockerTimeout)
 			return
 		}
 
@@ -277,7 +291,7 @@ func (d *DockerDriver) dockerClients() (*docker.Client, *docker.Client, error) {
 		if err != nil {
 			merr.Errors = append(merr.Errors, err)
 		}
-		client.HTTPClient.Timeout = dockerTimeout
+		client.SetTimeout(dockerTimeout)
 
 		waitClient, err = docker.NewClientFromEnv()
 		if err != nil {