toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify address formating

Browse Source 
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.

Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com>
Upstream-commit: 38303597452719fe4942c45a03783a9299235e1b
Component: engine
This commit is contained in:
Vladimir Varankin
2015-11-13 20:32:32 +03:00
parent 23764c99f4
commit e6bfd3b818
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/pkg/parsers/parsers.go
+1 -5
View File
@@ -107,11 +107,7 @@ func ParseTCPAddr(tryAddr string, defaultAddr string) (string, error) {
return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
}
if net.ParseIP(host).To4() == nil && strings.Contains(host, ":") {
// This is either an ipv6 address
host = "[" + host + "]"
}
return fmt.Sprintf("tcp://%s:%d%s", host, p, u.Path), nil
return fmt.Sprintf("tcp://%s%s", net.JoinHostPort(host, port), u.Path), nil
}
// ParseRepositoryTag gets a repos name and returns the right reposName + tag|digest