Merge pull request #29200 from coolljt0725/fix_attach

fix #29199, reset container if container start failed
This commit is contained in:
Michael Crosby 2016-12-07 15:21:28 -08:00 committed by GitHub
commit a42ca21f50
1 changed files with 3 additions and 2 deletions

View File

@ -119,6 +119,9 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
container.SetExitCode(128)
}
container.ToDisk()
container.Reset(false)
daemon.Cleanup(container)
// if containers AutoRemove flag is set, remove it after clean up
if container.HostConfig.AutoRemove {
@ -187,8 +190,6 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
container.SetExitCode(127)
}
container.Reset(false)
return fmt.Errorf("%s", errDesc)
}