kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17971 from narqo/simplify-addr-formating

Browse source 
Simplify final address formatting in parser.ParseTCPAddr
This commit is contained in:
Antonio Murdaca 2015-11-14 08:38:09 +01:00
commit 1448cd3ec2
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/parsers/parsers.go
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