Return 0 for pid if container is stopped

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2016-08-25 09:42:21 -07:00
parent 46d9535096
commit 4294d882b1
2 changed files with 12 additions and 2 deletions
+6 -1
View File
@@ -12,6 +12,7 @@ import (
"encoding/json"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/utils"
"github.com/urfave/cli"
)
@@ -130,10 +131,14 @@ func getContainers(context *cli.Context) ([]containerState, error) {
if err != nil {
return nil, err
}
pid := state.BaseState.InitProcessPid
if containerStatus == libcontainer.Stopped {
pid = 0
}
bundle, annotations := utils.Annotations(state.Config.Labels)
s = append(s, containerState{
ID: state.BaseState.ID,
InitProcessPid: state.BaseState.InitProcessPid,
InitProcessPid: pid,
Status: containerStatus.String(),
Bundle: bundle,
Created: state.BaseState.Created,