vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set canonical name correctly

Browse source 
Currently canonical name gets set to the local name and displayed in the errors.
Canonical name should be the unique and canonical name for an image.
Use docker.io as the canonical domain for images on the public registry.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2015-07-14 17:45:49 -07:00
parent b6c0f0505c
commit 01c8fb3665
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/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
docs/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,
}, },
} }