|
@@ -177,7 +177,7 @@ func (daemon *Daemon) foldFilter(config *ContainersConfig) (*listContext, error)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- names := map[string][]string{}
|
|
|
|
|
|
+ names := make(map[string][]string)
|
|
daemon.containerGraph().Walk("/", func(p string, e *graphdb.Entity) error {
|
|
daemon.containerGraph().Walk("/", func(p string, e *graphdb.Entity) error {
|
|
names[e.ID()] = append(names[e.ID()], p)
|
|
names[e.ID()] = append(names[e.ID()], p)
|
|
return nil
|
|
return nil
|
|
@@ -292,6 +292,10 @@ func (daemon *Daemon) transformContainer(container *Container, ctx *listContext)
|
|
Names: ctx.names[container.ID],
|
|
Names: ctx.names[container.ID],
|
|
ImageID: container.ImageID,
|
|
ImageID: container.ImageID,
|
|
}
|
|
}
|
|
|
|
+ if newC.Names == nil {
|
|
|
|
+ // Dead containers will often have no name, so make sure the response isn't null
|
|
|
|
+ newC.Names = []string{}
|
|
|
|
+ }
|
|
|
|
|
|
img, err := daemon.Repositories().LookupImage(container.Config.Image)
|
|
img, err := daemon.Repositories().LookupImage(container.Config.Image)
|
|
if err != nil {
|
|
if err != nil {
|