Backport of drivers/docker: refactor use of clients in docker driver …

…into release/1.5.x (#17741) This pull request was automerged via backport-assistant
hashicorp · Jun 26, 2023 · 14d360b · 14d360b
1 parent d77f0ab
commit 14d360b
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 124 deletions.
diff --git a/.changelog/17731.txt b/.changelog/17731.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+drivers/docker: Fixed a bug where long-running docker operations would incorrectly timeout
+```
diff --git a/drivers/docker/config.go b/drivers/docker/config.go
@@ -762,7 +762,7 @@ func (d *Driver) SetConfig(c *base.Config) error {
 		d.clientConfig = c.AgentConfig.Driver
 	}
 
-	dockerClient, _, err := d.dockerClients()
+	dockerClient, err := d.getDockerClient()
 	if err != nil {
 		return fmt.Errorf("failed to get docker client: %v", err)
 	}