mirror of https://github.com/containers/podman.git
fix start it
Signed-off-by: chenkang <kongchen28@gmail.com>
This commit is contained in:
parent
4ce7aa6ee8
commit
a1002beb78
|
@ -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 != "" {
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue