toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container

Browse Source 
daemon: cleanup getting container logic
Upstream-commit: 06aef2b5c24d694a4876bd43c57868dad59e2e11
Component: engine
This commit is contained in:
Alexander Morozov
2015-06-09 10:42:24 -07:00
parent 89751ffa0c 58ce17869e
commit 3c1a9cc928
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/daemon.go
+5 -8
View File
@@ -128,19 +128,16 @@ func (daemon *Daemon) Get(prefixOrName string) (*Container, error) {
}
// GetByName will match only an exact name provided; we ignore errors
containerByName, _ := daemon.GetByName(prefixOrName)
containerId, indexError := daemon.idIndex.Get(prefixOrName)
if containerByName != nil {
if containerByName, _ := daemon.GetByName(prefixOrName); containerByName != nil {
// prefix is an exact match to a full container Name
return containerByName, nil
}
if containerId != "" {
// prefix is a fuzzy match to a container ID
return daemon.containers.Get(containerId), nil
containerId, indexError := daemon.idIndex.Get(prefixOrName)
if indexError != nil {
return nil, indexError
}
return nil, indexError
return daemon.containers.Get(containerId), nil
}
// Exists returns a true if a container of the specified ID or name exists,