summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-23 18:27:32 +0200
committerGitHub <noreply@github.com>2020-04-23 18:27:32 +0200
commite5a3e46746a0db9fcd9b701693d557438420d1e4 (patch)
tree5a3cf2e6853a681ec9522f1917b33b9b899fbdb2 /cmd/podman
parent397dcc358a60eef1de22384c662480892a317ec4 (diff)
parent565f93531eae65ca85c286bf6bd2aa07eb713976 (diff)
downloadpodman-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 'cmd/podman')
-rw-r--r--cmd/podman/root.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 667f7e588..84c3867f2 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -155,6 +155,9 @@ func persistentPostRunE(cmd *cobra.Command, args []string) error {
cfg.Span.Finish()
cfg.SpanCloser.Close()
}
+
+ registry.ImageEngine().Shutdown(registry.Context())
+ registry.ContainerEngine().Shutdown(registry.Context())
return nil
}