0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12755 from LK4D4/use_f_for_remove

Browse source 
Use -f for rm instead of kill before
This commit is contained in:
Brian Goff 2015-04-24 15:34:38 -04:00
commit b76bbae413
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_utils.go
View file

@ -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 {