diff options
| author | Debarshi Ray <rishi@fedoraproject.org> | 2019-03-18 19:45:05 +0100 |
|---|---|---|
| committer | Debarshi Ray <rishi@fedoraproject.org> | 2019-03-18 21:03:22 +0100 |
| commit | 022bb95c8ed5dae455e569fc109f7f67b4270efc (patch) | |
| tree | 9879e8d5d2c59465d68a5d2a457c4936a0fe1de4 | |
| parent | 41019f747280ba2c47df2ce6f83ddebfc2000745 (diff) | |
| download | podman-022bb95c8ed5dae455e569fc109f7f67b4270efc.tar.gz podman-022bb95c8ed5dae455e569fc109f7f67b4270efc.tar.bz2 podman-022bb95c8ed5dae455e569fc109f7f67b4270efc.zip | |
Export ConmonPidFile in 'podman inspect' for containers
This can help scripts provide a more meaningful message when coming
across issues [1] which require the container to be re-created.
[1] eg., https://github.com/containers/libpod/issues/2673
Signed-off-by: Debarshi Ray <rishi@fedoraproject.org>
| -rw-r--r-- | libpod/container_inspect.go | 1 | ||||
| -rw-r--r-- | pkg/inspect/inspect.go | 1 | ||||
| -rw-r--r-- | test/e2e/inspect_test.go | 10 |
3 files changed, 12 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, 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"` diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index ebe610e6a..34328828f 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -66,6 +66,16 @@ var _ = Describe("Podman inspect", func() { Expect(session.ExitCode()).To(Equal(0)) }) + It("podman inspect container with GO format for ConmonPidFile", func() { + SkipIfRemote() + session, ec, _ := podmanTest.RunLsContainer("test1") + Expect(ec).To(Equal(0)) + + session = podmanTest.Podman([]string{"inspect", "--format", "{{.ConmonPidFile}}", "test1"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + }) + It("podman inspect container with size", func() { SkipIfRemote() _, ec, _ := podmanTest.RunLsContainer("") |