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

Merge pull request #14643 from dmcgowan/fix-canonical-repo-info 

Set canonical name correctly
This commit is contained in:
Jessie Frazelle 2015-07-15 09:39:01 -07:00
parent e0728035fe 7f48cd7dce
commit e46c7060cc
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graph/pull.go
View File

@ -352,9 +352,9 @@ func (s *TagStore) pullRepository(r *registry.Session, out io.Writer, repoInfo *
} }
} }
requestedTag := repoInfo.CanonicalName requestedTag := repoInfo.LocalName
if len(askedTag) > 0 { if len(askedTag) > 0 {
requestedTag = utils.ImageReference(repoInfo.CanonicalName, askedTag) requestedTag = utils.ImageReference(repoInfo.LocalName, askedTag)
} }
WriteStatus(requestedTag, out, sf, layersDownloaded) WriteStatus(requestedTag, out, sf, layersDownloaded)
return nil return nil
@ -508,9 +508,9 @@ func (s *TagStore) pullV2Repository(r *registry.Session, out io.Writer, repoInfo
} }
} }
requestedTag := repoInfo.CanonicalName requestedTag := repoInfo.LocalName
if len(tag) > 0 { if len(tag) > 0 {
requestedTag = utils.ImageReference(repoInfo.CanonicalName, tag) requestedTag = utils.ImageReference(repoInfo.LocalName, tag)
} }
WriteStatus(requestedTag, out, sf, layersDownloaded) WriteStatus(requestedTag, out, sf, layersDownloaded)
return nil return nil

4
registry/config.go
View File

@ -324,10 +324,8 @@ func (config *ServiceConfig) NewRepositoryInfo(reposName string) (*RepositoryInf
repoInfo.RemoteName = "library/" + normalizedName repoInfo.RemoteName = "library/" + normalizedName
} }
// *TODO: Prefix this with 'docker.io/'. repoInfo.CanonicalName = "docker.io/" + repoInfo.RemoteName
repoInfo.CanonicalName = repoInfo.LocalName
} else { } else {
// *TODO: Decouple index name from hostname (via registry configuration?)
repoInfo.LocalName = repoInfo.Index.Name + "/" + repoInfo.RemoteName repoInfo.LocalName = repoInfo.Index.Name + "/" + repoInfo.RemoteName
repoInfo.CanonicalName = repoInfo.LocalName repoInfo.CanonicalName = repoInfo.LocalName

24
registry/registry_test.go
View File

@ -337,7 +337,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "fooo/bar", RemoteName: "fooo/bar",
LocalName: "fooo/bar", LocalName: "fooo/bar",
CanonicalName: "fooo/bar", CanonicalName: "docker.io/fooo/bar",
Official: false, Official: false,
}, },
"library/ubuntu": { "library/ubuntu": {
@ -347,7 +347,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu", RemoteName: "library/ubuntu",
LocalName: "ubuntu", LocalName: "ubuntu",
CanonicalName: "ubuntu", CanonicalName: "docker.io/library/ubuntu",
Official: true, Official: true,
}, },
"nonlibrary/ubuntu": { "nonlibrary/ubuntu": {
@ -357,7 +357,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "nonlibrary/ubuntu", RemoteName: "nonlibrary/ubuntu",
LocalName: "nonlibrary/ubuntu", LocalName: "nonlibrary/ubuntu",
CanonicalName: "nonlibrary/ubuntu", CanonicalName: "docker.io/nonlibrary/ubuntu",
Official: false, Official: false,
}, },
"ubuntu": { "ubuntu": {
@ -367,7 +367,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu", RemoteName: "library/ubuntu",
LocalName: "ubuntu", LocalName: "ubuntu",
CanonicalName: "ubuntu", CanonicalName: "docker.io/library/ubuntu",
Official: true, Official: true,
}, },
"other/library": { "other/library": {
@ -377,7 +377,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "other/library", RemoteName: "other/library",
LocalName: "other/library", LocalName: "other/library",
CanonicalName: "other/library", CanonicalName: "docker.io/other/library",
Official: false, Official: false,
}, },
"127.0.0.1:8000/private/moonbase": { "127.0.0.1:8000/private/moonbase": {
@ -487,7 +487,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "public/moonbase", RemoteName: "public/moonbase",
LocalName: "public/moonbase", LocalName: "public/moonbase",
CanonicalName: "public/moonbase", CanonicalName: "docker.io/public/moonbase",
Official: false, Official: false,
}, },
"index." + IndexServerName() + "/public/moonbase": { "index." + IndexServerName() + "/public/moonbase": {
@ -497,7 +497,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "public/moonbase", RemoteName: "public/moonbase",
LocalName: "public/moonbase", LocalName: "public/moonbase",
CanonicalName: "public/moonbase", CanonicalName: "docker.io/public/moonbase",
Official: false, Official: false,
}, },
IndexServerName() + "/public/moonbase": { IndexServerName() + "/public/moonbase": {
@ -507,7 +507,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "public/moonbase", RemoteName: "public/moonbase",
LocalName: "public/moonbase", LocalName: "public/moonbase",
CanonicalName: "public/moonbase", CanonicalName: "docker.io/public/moonbase",
Official: false, Official: false,
}, },
"ubuntu-12.04-base": { "ubuntu-12.04-base": {
@ -517,7 +517,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu-12.04-base", RemoteName: "library/ubuntu-12.04-base",
LocalName: "ubuntu-12.04-base", LocalName: "ubuntu-12.04-base",
CanonicalName: "ubuntu-12.04-base", CanonicalName: "docker.io/library/ubuntu-12.04-base",
Official: true, Official: true,
}, },
IndexServerName() + "/ubuntu-12.04-base": { IndexServerName() + "/ubuntu-12.04-base": {
@ -527,7 +527,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu-12.04-base", RemoteName: "library/ubuntu-12.04-base",
LocalName: "ubuntu-12.04-base", LocalName: "ubuntu-12.04-base",
CanonicalName: "ubuntu-12.04-base", CanonicalName: "docker.io/library/ubuntu-12.04-base",
Official: true, Official: true,
}, },
IndexServerName() + "/ubuntu-12.04-base": { IndexServerName() + "/ubuntu-12.04-base": {
@ -537,7 +537,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu-12.04-base", RemoteName: "library/ubuntu-12.04-base",
LocalName: "ubuntu-12.04-base", LocalName: "ubuntu-12.04-base",
CanonicalName: "ubuntu-12.04-base", CanonicalName: "docker.io/library/ubuntu-12.04-base",
Official: true, Official: true,
}, },
"index." + IndexServerName() + "/ubuntu-12.04-base": { "index." + IndexServerName() + "/ubuntu-12.04-base": {
@ -547,7 +547,7 @@ func TestParseRepositoryInfo(t *testing.T) {
}, },
RemoteName: "library/ubuntu-12.04-base", RemoteName: "library/ubuntu-12.04-base",
LocalName: "ubuntu-12.04-base", LocalName: "ubuntu-12.04-base",
CanonicalName: "ubuntu-12.04-base", CanonicalName: "docker.io/library/ubuntu-12.04-base",
Official: true, Official: true,
}, },
} }