diff options
| author | chenkang <kongchen28@gmail.com> | 2021-04-17 23:35:27 +0800 |
|---|---|---|
| committer | chenkang <kongchen28@gmail.com> | 2021-04-17 23:35:27 +0800 |
| commit | a1002beb78e3a63c0704f5cd8f6ff6556e60bb2f (patch) | |
| tree | 9b05eb69ae41ef074f653f793ca57b24b7884797 | |
| parent | 4ce7aa6ee8aac132c4447d8a1be0fbce31d53bdc (diff) | |
| download | podman-a1002beb78e3a63c0704f5cd8f6ff6556e60bb2f.tar.gz podman-a1002beb78e3a63c0704f5cd8f6ff6556e60bb2f.tar.bz2 podman-a1002beb78e3a63c0704f5cd8f6ff6556e60bb2f.zip | |
fix start it
Signed-off-by: chenkang <kongchen28@gmail.com>
| -rw-r--r-- | libpod/container_inspect.go | 2 | ||||
| -rw-r--r-- | libpod/define/container_inspect.go | 2 | ||||
| -rw-r--r-- | test/e2e/start_test.go | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 57968039f..61cc43314 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -128,6 +128,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver StaticDir: config.StaticDir, OCIRuntime: config.OCIRuntime, ConmonPidFile: config.ConmonPidFile, + PidFile: config.PidFile, Name: config.Name, RestartCount: int32(runtimeInfo.RestartCount), Driver: driverData.Name, @@ -141,7 +142,6 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver Mounts: inspectMounts, Dependencies: c.Dependencies(), IsInfra: c.IsInfra(), - PidFile: config.PidFile, } if c.state.ConfigPath != "" { diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 126ce85a6..1a38f5b0a 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -627,6 +627,7 @@ type InspectContainerData struct { OCIConfigPath string `json:"OCIConfigPath,omitempty"` OCIRuntime string `json:"OCIRuntime,omitempty"` ConmonPidFile string `json:"ConmonPidFile"` + PidFile string `json:"PidFile"` Name string `json:"Name"` RestartCount int32 `json:"RestartCount"` Driver string `json:"Driver"` @@ -647,7 +648,6 @@ type InspectContainerData struct { IsInfra bool `json:"IsInfra"` Config *InspectContainerConfig `json:"Config"` HostConfig *InspectContainerHostConfig `json:"HostConfig"` - PidFile string `json:"PidFile"` } // InspectExecSession contains information about a given exec session. diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index d5d12fc71..cb2db0810 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -219,6 +219,7 @@ var _ = Describe("Podman start", func() { cid := session.OutputToString() session = podmanTest.Podman([]string{"start", cid}) + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) readFirstLine := func(path string) string { content, err := ioutil.ReadFile(path) |