containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix start it 

Signed-off-by: chenkang <kongchen28@gmail.com>
This commit is contained in:
chenkang 2021-04-17 23:35:27 +08:00
parent 4ce7aa6ee8
commit a1002beb78
No known key found for this signature in database
GPG Key ID: A592F3AE7ECB096B
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_inspect.go
View File

@ -128,6 +128,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
StaticDir: config.StaticDir, StaticDir: config.StaticDir,
OCIRuntime: config.OCIRuntime, OCIRuntime: config.OCIRuntime,
ConmonPidFile: config.ConmonPidFile, ConmonPidFile: config.ConmonPidFile,
PidFile: config.PidFile,
Name: config.Name, Name: config.Name,
RestartCount: int32(runtimeInfo.RestartCount), RestartCount: int32(runtimeInfo.RestartCount),
Driver: driverData.Name, Driver: driverData.Name,
@ -141,7 +142,6 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
Mounts: inspectMounts, Mounts: inspectMounts,
Dependencies: c.Dependencies(), Dependencies: c.Dependencies(),
IsInfra: c.IsInfra(), IsInfra: c.IsInfra(),
PidFile: config.PidFile,
} }
if c.state.ConfigPath != "" { if c.state.ConfigPath != "" {

2
libpod/define/container_inspect.go
View File

@ -627,6 +627,7 @@ type InspectContainerData struct {
OCIConfigPath string `json:"OCIConfigPath,omitempty"` OCIConfigPath string `json:"OCIConfigPath,omitempty"`
OCIRuntime string `json:"OCIRuntime,omitempty"` OCIRuntime string `json:"OCIRuntime,omitempty"`
ConmonPidFile string `json:"ConmonPidFile"` ConmonPidFile string `json:"ConmonPidFile"`
PidFile string `json:"PidFile"`
Name string `json:"Name"` Name string `json:"Name"`
RestartCount int32 `json:"RestartCount"` RestartCount int32 `json:"RestartCount"`
Driver string `json:"Driver"` Driver string `json:"Driver"`
@ -647,7 +648,6 @@ type InspectContainerData struct {
IsInfra bool `json:"IsInfra"` IsInfra bool `json:"IsInfra"`
Config *InspectContainerConfig `json:"Config"` Config *InspectContainerConfig `json:"Config"`
HostConfig *InspectContainerHostConfig `json:"HostConfig"` HostConfig *InspectContainerHostConfig `json:"HostConfig"`
PidFile string `json:"PidFile"`
} }
// InspectExecSession contains information about a given exec session. // InspectExecSession contains information about a given exec session.

1
test/e2e/start_test.go
View File

@ -219,6 +219,7 @@ var _ = Describe("Podman start", func() {
cid := session.OutputToString() cid := session.OutputToString()
session = podmanTest.Podman([]string{"start", cid}) session = podmanTest.Podman([]string{"start", cid})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
readFirstLine := func(path string) string { readFirstLine := func(path string) string {
content, err := ioutil.ReadFile(path) content, err := ioutil.ReadFile(path)