Remove a volume with --force if container is running

Currently we are not passing the force flag down to the removal of
the running container. If the container is running, and we set
--force when removing the volume, the container should be stopped.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

2 files changed, 9 insertions, 5 deletions

diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go
index b08693529..ed3cc971c 100644
--- a/libpod/runtime_volume_linux.go
+++ b/libpod/runtime_volume_linux.go
@@ -230,11 +230,7 @@ func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool, timeo
 
 			logrus.Debugf("Removing container %s (depends on volume %q)", ctr.ID(), v.Name())
 
-			// TODO: do we want to set force here when removing
-			// containers?
-			// I'm inclined to say no, in case someone accidentally
-			// wipes a container they're using...
-			if err := r.removeContainer(ctx, ctr, false, false, false, timeout); err != nil {
+			if err := r.removeContainer(ctx, ctr, force, false, false, timeout); err != nil {
 				return errors.Wrapf(err, "error removing container %s that depends on volume %s", ctr.ID(), v.Name())
 			}
 		}
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index 490d635e5..7128f1b65 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -97,6 +97,14 @@ Labels.l       | $mylabel
     run_podman volume rm $myvolume
 }
 
+# Removing volumes with --force
+@test "podman volume rm --force" {
+    run_podman run -d --volume myvol:/myvol $IMAGE top
+    cid=$output
+    run_podman 2 volume rm myvol
+    is "$output" "Error: volume myvol is being used by the following container(s): $cid: volume is being used" "should error since container is running"
+    run_podman volume rm myvol --force
+}
 
 # Running scripts (executables) from a volume
 @test "podman volume: exec/noexec" {