mirror of
https://github.com/docker/docs.git
synced 2026-03-27 14:28:47 +07:00
Don't let Names be null on GET /containers/JSON
Fixes an issue where a `Dead` container has no names so the API returns `null` instead of an empty array. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
@@ -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 {
|
||||
names[e.ID()] = append(names[e.ID()], p)
|
||||
return nil
|
||||
@@ -292,6 +292,10 @@ func (daemon *Daemon) transformContainer(container *Container, ctx *listContext)
|
||||
Names: ctx.names[container.ID],
|
||||
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)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user