Merge pull request docker#93 from doringeman/api-version-negotiation

xenoscopic · web-flow · commit 1dee9106de11 · 2025-06-16T10:40:52.000-06:00
Enable automatic API version negotiation for the Docker client
diff --git a/cmd/cli/desktop/context.go b/cmd/cli/desktop/context.go
@@ -72,7 +72,11 @@ func DockerClientForContext(cli *command.DockerCli, name string) (*clientpkg.Cli
 	if err != nil {
 		return nil, fmt.Errorf("unable to determine context endpoint: %w", err)
 	}
-	return clientpkg.NewClientWithOpts(clientpkg.FromEnv, clientpkg.WithHost(endpoint.Host))
+	return clientpkg.NewClientWithOpts(
+		clientpkg.FromEnv,
+		clientpkg.WithHost(endpoint.Host),
+		clientpkg.WithAPIVersionNegotiation(),
+	)
 }
 
 // ModelRunnerEngineKind encodes the kind of Docker engine associated with the

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,11 @@ func DockerClientForContext(cli command.DockerCli, name string) (clientpkg.Cli`
`72`	`72`	`if err != nil {`
`73`	`73`	`return nil, fmt.Errorf("unable to determine context endpoint: %w", err)`
`74`	`74`	`}`
`75`		`- return clientpkg.NewClientWithOpts(clientpkg.FromEnv, clientpkg.WithHost(endpoint.Host))`
	`75`	`+ return clientpkg.NewClientWithOpts(`
	`76`	`+ clientpkg.FromEnv,`
	`77`	`+ clientpkg.WithHost(endpoint.Host),`
	`78`	`+ clientpkg.WithAPIVersionNegotiation(),`
	`79`	`+ )`
`76`	`80`	`}`
`77`	`81`
`78`	`82`	`// ModelRunnerEngineKind encodes the kind of Docker engine associated with the`