summaryrefslogtreecommitdiff
path: root/libpod/container_inspect.go
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 /libpod/container_inspect.go
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 'libpod/container_inspect.go')
-rw-r--r--libpod/container_inspect.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index a76163692..aa3a07888 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -93,6 +93,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *inspect.Data)
HostsPath: hostsPath,
StaticDir: config.StaticDir,
LogPath: config.LogPath,
+ ConmonPidFile: config.ConmonPidFile,
Name: config.Name,
Driver: driverData.Name,
MountLabel: config.MountLabel,