clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11570 from runcom/9658-consistent-autoremove

Browse Source 
Remove container if --rm flag is passed and container cannot be started
This commit is contained in:
Alexander Morozov
2015-03-23 15:38:51 -07:00
parent bcb369af11 d124197cc7
commit 197a3f0a98
2 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/commands.go
+8 -3
View File
@@ -2495,6 +2495,14 @@ func (cli *DockerCli) CmdRun(args ...string) error {
}
}
defer func() {
if *flAutoRemove {
if _, _, err = readBody(cli.call("DELETE", "/containers/"+createResponse.ID+"?v=1", nil, false)); err != nil {
log.Errorf("Error deleting container: %s", err)
}
}
}()
//start the container
if _, _, err = readBody(cli.call("POST", "/containers/"+createResponse.ID+"/start", nil, false)); err != nil {
return err
@@ -2532,9 +2540,6 @@ func (cli *DockerCli) CmdRun(args ...string) error {
if _, status, err = getExitCode(cli, createResponse.ID); err != nil {
return err
}
if _, _, err := readBody(cli.call("DELETE", "/containers/"+createResponse.ID+"?v=1", nil, false)); err != nil {
return err
}
} else {
// No Autoremove: Simply retrieve the exit code
if !config.Tty {