From b686be0c9b7dd0e4bf1a0379d49465fda86f3f6a Mon Sep 17 00:00:00 2001 From: vrenjith Date: Thu, 4 Aug 2016 11:42:47 +0530 Subject: [PATCH 1/2] Update checks_test.go Remove docker volumes while exiting container --- client/driver/executor/checks_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/driver/executor/checks_test.go b/client/driver/executor/checks_test.go index 62d7910b873..587797784a7 100644 --- 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}) } From 52c6201f4af6a2f50a0a7d53d0cb38ef5acbb6f4 Mon Sep 17 00:00:00 2001 From: vrenjith Date: Thu, 4 Aug 2016 11:43:50 +0530 Subject: [PATCH 2/2] Update docker.go Remove container volumes --- client/driver/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index 8407d4675cc..9c9a29ab8ee 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -1015,7 +1015,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) }