Revert "cli/command: cli.initializeFromClient() use client's config f…

…or host" This reverts commit 459c564. Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Nov 4, 2022 · 93a39e0 · 93a39e0
1 parent 598e509
commit 93a39e0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/cli/command/cli.go b/cli/command/cli.go
@@ -331,7 +331,7 @@ func (cli *DockerCli) getInitTimeout() time.Duration {
 
 func (cli *DockerCli) initializeFromClient() {
 	ctx := context.Background()
-	if !strings.HasPrefix(cli.client.DaemonHost(), "ssh://") {
+	if !strings.HasPrefix(cli.DockerEndpoint().Host, "ssh://") {
 		// @FIXME context.WithTimeout doesn't work with connhelper / ssh connections
 		// time="2020-04-10T10:16:26Z" level=warning msg="commandConn.CloseWrite: commandconn: failed to wait: signal: killed"
 		var cancel func()
@@ -374,9 +374,7 @@ func (cli *DockerCli) CurrentContext() string {
 	return resolveContextName(cli.options, cli.configFile)
 }
 
-// DockerEndpoint returns the current docker endpoint.
-//
-// TODO(thaJeztah): deprecate this in favor or cli.Client().Host? (unless someone needs the TLSConfig).
+// DockerEndpoint returns the current docker endpoint
 func (cli *DockerCli) DockerEndpoint() docker.Endpoint {
 	if err := cli.initialize(); err != nil {
 		// Note that we're not terminating here, as this function may be used