Browse Source

Merge pull request #12755 from LK4D4/use_f_for_remove

Use -f for rm instead of kill before
Brian Goff 10 years ago
parent
commit
b76bbae413
1 changed files with 1 additions and 3 deletions
  1. 1 3
      integration-cli/docker_utils.go

+ 1 - 3
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 {