diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-23 18:27:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-23 18:27:32 +0200 |
commit | e5a3e46746a0db9fcd9b701693d557438420d1e4 (patch) | |
tree | 5a3cf2e6853a681ec9522f1917b33b9b899fbdb2 /pkg/domain/infra/abi/containers.go | |
parent | 397dcc358a60eef1de22384c662480892a317ec4 (diff) | |
parent | 565f93531eae65ca85c286bf6bd2aa07eb713976 (diff) | |
download | podman-e5a3e46746a0db9fcd9b701693d557438420d1e4.tar.gz podman-e5a3e46746a0db9fcd9b701693d557438420d1e4.tar.bz2 podman-e5a3e46746a0db9fcd9b701693d557438420d1e4.zip |
Merge pull request #5946 from jwhonce/wip/shutdown
V2 restore libpod.Shutdown() when exiting podman commands
Diffstat (limited to 'pkg/domain/infra/abi/containers.go')
-rw-r--r-- | pkg/domain/infra/abi/containers.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 73a0d8ec3..a77b18ce1 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -957,3 +957,10 @@ func (ic *ContainerEngine) ContainerPort(ctx context.Context, nameOrId string, o } return reports, nil } + +// Shutdown Libpod engine +func (ic *ContainerEngine) Shutdown(_ context.Context) { + shutdownSync.Do(func() { + _ = ic.Libpod.Shutdown(false) + }) +} |