Merge pull request #5392 from vvoland/5345-27.x

[27.x backport] cli/connhelper: getConnectionHelper: move ssh-option funcs out of closure
docker · Sep 2, 2024 · 074dfc0 · 074dfc0
2 parents 9242328 + 1a0b6a7
commit 074dfc0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cli/connhelper/connhelper.go b/cli/connhelper/connhelper.go
@@ -45,14 +45,14 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper
 		if err != nil {
 			return nil, errors.Wrap(err, "ssh host connection is not valid")
 		}
+		sshFlags = addSSHTimeout(sshFlags)
+		sshFlags = disablePseudoTerminalAllocation(sshFlags)
 		return &ConnectionHelper{
 			Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				args := []string{"docker"}
 				if sp.Path != "" {
 					args = append(args, "--host", "unix://"+sp.Path)
 				}
-				sshFlags = addSSHTimeout(sshFlags)
-				sshFlags = disablePseudoTerminalAllocation(sshFlags)
 				args = append(args, "system", "dial-stdio")
 				return commandconn.New(ctx, "ssh", append(sshFlags, sp.Args(args...)...)...)
 			},