diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-02-26 12:16:58 -0500 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-02-26 12:16:58 -0500 |
commit | 83db80ce172975ddb7c5bfc0d1cea03d5c6b6c94 (patch) | |
tree | 24dc828a104d2c4f4fc10400f4b45be4e7fbf111 /cmd/podman/cleanup.go | |
parent | 0e252f043707fe4ca556751ee9b23243ce22e3f3 (diff) | |
download | podman-83db80ce172975ddb7c5bfc0d1cea03d5c6b6c94.tar.gz podman-83db80ce172975ddb7c5bfc0d1cea03d5c6b6c94.tar.bz2 podman-83db80ce172975ddb7c5bfc0d1cea03d5c6b6c94.zip |
Only remove image volumes when removing containers
When removing volumes with rm --volumes we want to only remove
volumes that were created with the container. Volumes created
separately via 'podman volume create' should not be removed.
Also ensure that --rm implies volumes will be removed.
Fixes #2441
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/cleanup.go')
-rw-r--r-- | cmd/podman/cleanup.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go index d68255aa2..33d456643 100644 --- a/cmd/podman/cleanup.go +++ b/cmd/podman/cleanup.go @@ -60,7 +60,7 @@ func cleanupCmd(c *cliconfig.CleanupValues) error { for _, ctr := range cleanupContainers { hadError := false if c.Remove { - if err := runtime.RemoveContainer(ctx, ctr, false, false); err != nil { + if err := runtime.RemoveContainer(ctx, ctr, false, true); err != nil { if lastError != nil { fmt.Fprintln(os.Stderr, lastError) } |