Merge pull request #1519 from vrenjith/master

Remove docker volumes while removing container
hashicorp · Aug 4, 2016 · ed08b5f · ed08b5f
2 parents d4a4700 + 52c6201
commit ed08b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -1004,7 +1004,7 @@ func (h *DockerHandle) run() {
 	}
 
 	// Remove the container
-	if err := h.client.RemoveContainer(docker.RemoveContainerOptions{ID: h.containerID, Force: true}); err != nil {
+	if err := h.client.RemoveContainer(docker.RemoveContainerOptions{ID: h.containerID, RemoveVolumes: true, Force: true}); err != nil {
 		h.logger.Printf("[ERR] driver.docker: error removing container: %v", err)
 	}
 

diff --git a/client/driver/executor/checks_test.go b/client/driver/executor/checks_test.go
@@ -133,5 +133,5 @@ func TestDockerScriptCheck(t *testing.T) {
 // removeContainer kills and removes a container
 func removeContainer(client *docker.Client, containerID string) {
 	client.KillContainer(docker.KillContainerOptions{ID: containerID})
-	client.RemoveContainer(docker.RemoveContainerOptions{ID: containerID, Force: true})
+	client.RemoveContainer(docker.RemoveContainerOptions{ID: containerID, RemoveVolumes: true, Force: true})
 }