diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-08 13:35:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 13:35:43 -0500 |
| commit | 5529143877778ef8bcdd05179e279bb7d662b431 (patch) | |
| tree | 6f95d2a9c3832b1e00f04d30045d11f0fb37425f /cmd | |
| parent | 2a58bdc89d5646de62b358622275a25a8bb09a3f (diff) | |
| parent | 3921f10a729054c23296f392b0f271c1ac5e5770 (diff) | |
| download | podman-5529143877778ef8bcdd05179e279bb7d662b431.tar.gz podman-5529143877778ef8bcdd05179e279bb7d662b431.tar.bz2 podman-5529143877778ef8bcdd05179e279bb7d662b431.zip | |
Merge pull request #302 from rhatdan/cleanup
cleanup network stack as well as storage when container shuts down.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/run.go | 2 | ||||
| -rw-r--r-- | cmd/podman/start.go | 4 |
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 } |