Merge pull request #33908 from thaJeztah/carry-33883-ignore-nonexistent-containers

[carry 33883] daemon: Ignore nonexistent containers when listing containers
Upstream-commit: cab50de4d682890187b48984e0c81b98cb69ed4f
Component: engine
This commit is contained in:
Vincent Demeester
2017-07-03 17:06:54 +02:00
committed by GitHub

View File

@ -162,11 +162,13 @@ func (daemon *Daemon) filterByNameIDMatches(view container.View, ctx *listContex
cntrs := make([]container.Snapshot, 0, len(matches))
for id := range matches {
c, err := view.Get(id)
if err != nil {
return nil, err
}
if c != nil {
switch err.(type) {
case nil:
cntrs = append(cntrs, *c)
case container.NoSuchContainerError:
// ignore error
default:
return nil, err
}
}