diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-14 21:45:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 21:45:58 +0100 |
| commit | 8ec9eb0a7617b6c2db6ed092ab741552dc7cba02 (patch) | |
| tree | 2d1212425257a8d332f4400d0896aa2e465176b0 /cmd/podman/rm.go | |
| parent | dd82acd8ba02be51ec5fea65584e1f7b2036d7c8 (diff) | |
| parent | 52df1fa7e054d577e8416d1d46db1741ad324d4a (diff) | |
| download | podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.gz podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.bz2 podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.zip | |
Merge pull request #2229 from rhatdan/volumes
Fix volume handling in podman
Diffstat (limited to 'cmd/podman/rm.go')
| -rw-r--r-- | cmd/podman/rm.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 1e5e9d254..d170e5357 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -39,8 +39,7 @@ func init() { flags.BoolVarP(&rmCommand.All, "all", "a", false, "Remove all containers") flags.BoolVarP(&rmCommand.Force, "force", "f", false, "Force removal of a running container. The default is false") flags.BoolVarP(&rmCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") - flags.BoolVarP(&rmCommand.Volumes, "volumes", "v", false, "Remove the volumes associated with the container (Not implemented yet)") - + flags.BoolVarP(&rmCommand.Volumes, "volumes", "v", false, "Remove the volumes associated with the container") } // saveCmd saves the image to either docker-archive or oci @@ -79,7 +78,7 @@ func rmCmd(c *cliconfig.RmValues) error { for _, container := range delContainers { con := container f := func() error { - return runtime.RemoveContainer(ctx, con, c.Force) + return runtime.RemoveContainer(ctx, con, c.Force, c.Volumes) } deleteFuncs = append(deleteFuncs, shared.ParallelWorkerInput{ |