0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25920 from coolljt0725/fix_inspect_dead

Browse source 
Fix inspect Dead container
This commit is contained in:
Vincent Demeester 2016-08-25 17:00:59 +02:00 • committed by GitHub
commit 8ebb7dba8b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/inspect.go
View file

@ -167,7 +167,10 @@ func (daemon *Daemon) getInspectData(container *container.Container, size bool)
contJSONBase.GraphDriver.Name = container.Driver
graphDriverData, err := container.RWLayer.Metadata()
if err != nil {
// If container is marked as Dead, the container's graphdriver metadata
// could have been removed, it will cause error if we try to get the metadata,
// we can ignore the error if the container is dead.
if err != nil && !container.Dead {
return nil, err
}
contJSONBase.GraphDriver.Data = graphDriverData