Repository: mesos Updated Branches: refs/heads/master 4b05b14ad -> 85b09e22b
Added `-v` flag to `docker rm`. Review: https://reviews.apache.org/r/38910 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/85b09e22 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/85b09e22 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/85b09e22 Branch: refs/heads/master Commit: 85b09e22b834beffa4b96fa9e2712de07fb2de2e Parents: 4b05b14 Author: Greg Mann <[email protected]> Authored: Tue Oct 13 01:49:06 2015 +0000 Committer: Timothy Chen <[email protected]> Committed: Tue Oct 13 01:50:03 2015 +0000 ---------------------------------------------------------------------- src/docker/docker.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/85b09e22/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index afcedf1..56d63dc 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -676,9 +676,10 @@ Future<Nothing> Docker::rm( const string& containerName, bool force) const { + // The `-v` flag removes Docker volumes that may be present. const string cmd = path + " -H " + socket + - (force ? " rm -f " : " rm ") + containerName; + (force ? " rm -f -v " : " rm -v ") + containerName; VLOG(1) << "Running " << cmd;
