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 #2955 from crosbymichael/search-name-first

Browse source 
Search for repo first before image id
This commit is contained in:
Victor Vieux 2013-12-05 16:16:55 -08:00
commit 7a87023587
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tags.go
View file

@ -66,20 +66,18 @@ func (store *TagStore) Reload() error {
} }
func (store *TagStore) LookupImage(name string) (*Image, error) { func (store *TagStore) LookupImage(name string) (*Image, error) {
img, err := store.graph.Get(name) // FIXME: standardize on returning nil when the image doesn't exist, and err for everything else
// (so we can pass all errors here)
repos, tag := utils.ParseRepositoryTag(name)
if tag == "" {
tag = DEFAULTTAG
}
img, err := store.GetImage(repos, tag)
if err != nil { if err != nil {
// FIXME: standardize on returning nil when the image doesn't exist, and err for everything else return nil, err
// (so we can pass all errors here) } else if img == nil {
repos, tag := utils.ParseRepositoryTag(name) if img, err = store.graph.Get(name); err != nil {
if tag == "" {
tag = DEFAULTTAG
}
if i, err := store.GetImage(repos, tag); err != nil {
return nil, err return nil, err
} else if i == nil {
return nil, fmt.Errorf("Image does not exist: %s", name)
} else {
img = i
} }
} }
return img, nil return img, nil