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

Merge pull request #7443 from ewindisch/name-id-lookup-reversal 

Container name lookups to prefer IDs over names
This commit is contained in:
Michael Crosby 2014-08-07 11:14:47 -07:00
parent abbfc7e828 231e07ded4
commit 140e6abb17
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/daemon.go
View File

@ -140,16 +140,13 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
// Get looks for a container by the specified ID or name, and returns it. // Get looks for a container by the specified ID or name, and returns it.
// If the container is not found, or if an error occurs, nil is returned. // If the container is not found, or if an error occurs, nil is returned.
func (daemon *Daemon) Get(name string) *Container { func (daemon *Daemon) Get(name string) *Container {
if id, err := daemon.idIndex.Get(name); err == nil {
return daemon.containers.Get(id)
}
if c, _ := daemon.GetByName(name); c != nil { if c, _ := daemon.GetByName(name); c != nil {
return c return c
} }
return nil
id, err := daemon.idIndex.Get(name)
if err != nil {
return nil
}
return daemon.containers.Get(id)
} }
// Exists returns a true if a container of the specified ID or name exists, // Exists returns a true if a container of the specified ID or name exists,