mirror of
https://github.com/clearlinux/docker.git
synced 2026-10-03 15:28:35 +00:00
Set canonical name correctly
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:
+4
-4
@@ -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 {
|
||||
requestedTag = utils.ImageReference(repoInfo.CanonicalName, askedTag)
|
||||
requestedTag = utils.ImageReference(repoInfo.LocalName, askedTag)
|
||||
}
|
||||
WriteStatus(requestedTag, out, sf, layersDownloaded)
|
||||
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 {
|
||||
requestedTag = utils.ImageReference(repoInfo.CanonicalName, tag)
|
||||
requestedTag = utils.ImageReference(repoInfo.LocalName, tag)
|
||||
}
|
||||
WriteStatus(requestedTag, out, sf, layersDownloaded)
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user