summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-02-06 16:51:05 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2018-02-08 06:42:21 -0500
commit3921f10a729054c23296f392b0f271c1ac5e5770 (patch)
treeb129bb402157b23eb4f8228818cc94d87b9fd88b /cmd
parent8fdccb77648f5b772c6bae98fce4734b1a54ed4a (diff)
downloadpodman-3921f10a729054c23296f392b0f271c1ac5e5770.tar.gz
podman-3921f10a729054c23296f392b0f271c1ac5e5770.tar.bz2
podman-3921f10a729054c23296f392b0f271c1ac5e5770.zip
cleanup network stack as well as storage when container shuts down.
This patch will cleanup the network stack when the container exits Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/run.go2
-rw-r--r--cmd/podman/start.go4
2 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 97f60cdbf..2f3468fd2 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -145,5 +145,5 @@ func runCmd(c *cli.Context) error {
if createConfig.Rm {
return runtime.RemoveContainer(ctr, true)
}
- return ctr.CleanupStorage()
+ return ctr.Cleanup()
}
diff --git a/cmd/podman/start.go b/cmd/podman/start.go
index 0dad5e237..18e8f7766 100644
--- a/cmd/podman/start.go
+++ b/cmd/podman/start.go
@@ -138,6 +138,10 @@ func startCmd(c *cli.Context) error {
} else {
exitCode = int(ecode)
}
+ if lastError != nil {
+ fmt.Fprintln(os.Stderr, lastError)
+ }
+ lastError = ctr.Cleanup()
}
return lastError
}