Skip to content

fix: use actual daemon URL for proxy lookup in SSH connections #7054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vigneshakaviki wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

fix: use actual daemon URL for proxy lookup in SSH connections #7054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cli/connhelper/connhelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
return commandconn.New(ctx, "ssh", sshArgs...)
},
Host: "http://docker.example.com",
Host: daemonURL,
}, nil
}
// Future version may support plugins via ~/.docker/config.json. e.g. "dind"
Expand All @@ -74,6 +74,8 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper
}

// GetCommandConnectionHelper returns Docker-specific connection helper constructed from an arbitrary command.
// Note: Host is set to a default value since we don't have information about the target daemon.
// Users should configure proxies for this default host in their config.json if needed.
func GetCommandConnectionHelper(cmd string, flags ...string) (*ConnectionHelper, error) {
return &ConnectionHelper{
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
Expand Down