cli/command: cli.initializeFromClient() use client's config for host

Make sure we actually look at the host configured for the client,
which should be the source of truth here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/command/cli.go

@@ -334,7 +334,7 @@ func (cli *DockerCli) getInitTimeout() time.Duration {
 
 func (cli *DockerCli) initializeFromClient() {
 	ctx := context.Background()
-	if !strings.HasPrefix(cli.DockerEndpoint().Host, "ssh://") {
+	if !strings.HasPrefix(cli.client.DaemonHost(), "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()
@@ -429,7 +429,9 @@ func resolveContextName(opts *cliflags.ClientOptions, config *configfile.ConfigF
 	return DefaultContextName
 }
 
-// DockerEndpoint returns the current docker endpoint
+// DockerEndpoint returns the current docker endpoint.
+//
+// TODO(thaJeztah): deprecate this in favor or cli.Client().Host? (unless someone needs the TLSConfig).
 func (cli *DockerCli) DockerEndpoint() docker.Endpoint {
 	return cli.dockerEndpoint
 }