diff --git a/cluster/container.go b/cluster/container.go index 5fce80cb03..c9c13cd4b8 100644 --- a/cluster/container.go +++ b/cluster/container.go @@ -49,11 +49,15 @@ func (containers Containers) Get(IDOrName string) *Container { // Match name, /name or engine/name. for _, container := range containers { + found := false for _, name := range container.Names { if name == IDOrName || name == "/"+IDOrName || container.Engine.ID+name == IDOrName || container.Engine.Name+name == IDOrName { - return container + found = true } } + if found { + candidates = append(candidates, container) + } } if size := len(candidates); size == 1 {