summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-18 14:36:49 -0700
committerGitHub <noreply@github.com>2019-03-18 14:36:49 -0700
commit8afe02fe96cc6e729ba2e279034650cd99068fae (patch)
tree1b115a08fa8fb85e0a9054fd7ed3c4a5465ac92b /pkg
parent7ed8366834429ce5141fc8b8c98eef58c18a4c31 (diff)
parent022bb95c8ed5dae455e569fc109f7f67b4270efc (diff)
downloadpodman-8afe02fe96cc6e729ba2e279034650cd99068fae.tar.gz
podman-8afe02fe96cc6e729ba2e279034650cd99068fae.tar.bz2
podman-8afe02fe96cc6e729ba2e279034650cd99068fae.zip
Merge pull request #2698 from debarshiray/wip/rishi/podman-inspect-conmon-pid-file
Export ConmonPidFile in 'podman inspect' for containers
Diffstat (limited to 'pkg')
-rw-r--r--pkg/inspect/inspect.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go
index 82fe37f18..270e431ad 100644
--- a/pkg/inspect/inspect.go
+++ b/pkg/inspect/inspect.go
@@ -158,6 +158,7 @@ type ContainerInspectData struct {
HostsPath string `json:"HostsPath"`
StaticDir string `json:"StaticDir"`
LogPath string `json:"LogPath"`
+ ConmonPidFile string `json:"ConmonPidFile"`
Name string `json:"Name"`
RestartCount int32 `json:"RestartCount"` //TODO
Driver string `json:"Driver"`