opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3039 from mheon/podman_init

Browse Source 
Add podman init command
This commit is contained in:
OpenShift Merge Robot
2019-05-02 20:45:44 +02:00
committed by GitHub
parent 3cec403268 4b33914535
commit ccf28a89bd
18 changed files with 388 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/container_internal.go
View File

@ -811,8 +811,9 @@ func (c *Container) cleanupRuntime(ctx context.Context) error {
span.SetTag("struct", "container")
defer span.Finish()
// If the container is not ContainerStateStopped, do nothing
if c.state.State != ContainerStateStopped {
// If the container is not ContainerStateStopped or
// ContainerStateCreated, do nothing.
if c.state.State != ContainerStateStopped && c.state.State != ContainerStateCreated {
return nil
}
@ -825,9 +826,14 @@ func (c *Container) cleanupRuntime(ctx context.Context) error {
return err
}
// Our state is now Exited, as we've removed ourself from
// the runtime.
c.state.State = ContainerStateExited
// If we were Stopped, we are now Exited, as we've removed ourself
// from the runtime.
// If we were Created, we are now Configured.
if c.state.State == ContainerStateStopped {
c.state.State = ContainerStateExited
} else if c.state.State == ContainerStateCreated {
c.state.State = ContainerStateConfigured
}
if c.valid {
if err := c.save(); err != nil {