Skip to content

infer unix:// prefix for path-like DOCKER_HOST values #6007

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

infer unix:// prefix for path-like DOCKER_HOST values #6007

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion opts/hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ func parseDockerDaemonHost(addr string) (string, error) {
proto, host, hasProto := strings.Cut(addr, "://")
if !hasProto && proto != "" {
host = proto
proto = "tcp"
// if the addr string starts with "/", "./", or "../", the user very likely meant "path to a socket"
if strings.HasPrefix(host, "/") || strings.HasPrefix(host, "./") || strings.HasPrefix(host, "../") {
proto = "unix"
} else {
proto = "tcp"
}
}

switch proto {
Expand Down
3 changes: 3 additions & 0 deletions opts/hosts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ func TestParseHost(t *testing.T) {
"unix://path/to/socket": "unix://path/to/socket",
"npipe://": "npipe://" + defaultNamedPipe,
"npipe:////./pipe/foo": "npipe:////./pipe/foo",
"/some.sock": "unix:///some.sock",
"./single/dot": "unix://./single/dot",
"../double/dot": "unix://../double/dot",
}

for _, value := range invalid {
Expand Down