diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 06:06:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 06:06:14 -0700 |
commit | a3c4ce6717cab56d968fbe1fff0ced19f45c23cb (patch) | |
tree | 41657a47b6edeb8ab4776eddf64cb76f59b2813c /libpod/pod_api.go | |
parent | d5687946f6a0aa14a5326f26ca0ceca68588056f (diff) | |
parent | 978aac665060140f08a5574e3611a17cc98516c0 (diff) | |
download | podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.gz podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.bz2 podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.zip |
Merge pull request #1531 from mheon/add_exited_state
Add ContainerStateExited and OCI delete() in cleanup()
Diffstat (limited to 'libpod/pod_api.go')
-rw-r--r-- | libpod/pod_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 0c518da0d..3d5512e8c 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -77,7 +77,7 @@ func (p *Pod) Start(ctx context.Context) (map[string]error, error) { // containers. The container ID is mapped to the error encountered. The error is // set to ErrCtrExists // If both error and the map are nil, all containers were stopped without error -func (p *Pod) Stop(cleanup bool) (map[string]error, error) { +func (p *Pod) Stop(ctx context.Context, cleanup bool) (map[string]error, error) { p.lock.Lock() defer p.lock.Unlock() @@ -118,7 +118,7 @@ func (p *Pod) Stop(cleanup bool) (map[string]error, error) { } if cleanup { - if err := ctr.cleanup(); err != nil { + if err := ctr.cleanup(ctx); err != nil { ctrErrors[ctr.ID()] = err } } |