From 887ad57cfa46df542001a1bb4e3ab052ce5f5ed9 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 24 Apr 2015 11:05:17 -0700 Subject: [PATCH] Use -f for rm instead of kill before Signed-off-by: Alexander Morozov --- integration-cli/docker_utils.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index 20e87244e7..907be173c2 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -361,9 +361,7 @@ func readBody(b io.ReadCloser) ([]byte, error) { func deleteContainer(container string) error { container = strings.TrimSpace(strings.Replace(container, "\n", " ", -1)) - killArgs := strings.Split(fmt.Sprintf("kill %v", container), " ") - runCommand(exec.Command(dockerBinary, killArgs...)) - rmArgs := strings.Split(fmt.Sprintf("rm -v %v", container), " ") + rmArgs := strings.Split(fmt.Sprintf("rm -fv %v", container), " ") exitCode, err := runCommand(exec.Command(dockerBinary, rmArgs...)) // set error manually if not set if exitCode != 0 && err == nil {