docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1408 from dotcloud/1407-localhost_is_a_domain-fix 

Always consider localhost as a domain name when parsing the FQN repos name
This commit is contained in:
Victor Vieux 2013-08-05 08:50:12 -07:00
parent feda3db1dd c22f2617ad
commit 1b08ab92d1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
registry/registry.go
View File

@ -69,7 +69,8 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
return "", "", ErrInvalidRepositoryName return "", "", ErrInvalidRepositoryName
} }
nameParts := strings.SplitN(reposName, "/", 2) nameParts := strings.SplitN(reposName, "/", 2)
if !strings.Contains(nameParts[0], ".") && !strings.Contains(nameParts[0], ":") { if !strings.Contains(nameParts[0], ".") && !strings.Contains(nameParts[0], ":") &&
nameParts[0] != "localhost" {
// This is a Docker Index repos (ex: samalba/hipache or ubuntu) // This is a Docker Index repos (ex: samalba/hipache or ubuntu)
err := validateRepositoryName(reposName) err := validateRepositoryName(reposName)
return auth.IndexServerAddress(), reposName, err return auth.IndexServerAddress(), reposName, err