From e806821b53f9ca1f1a3d933e7bbfe04a5566a3bf Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Wed, 7 Dec 2016 01:37:08 -0500 Subject: [PATCH] fix #29199, reset container if container start failed Signed-off-by: Lei Jitang --- daemon/start.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/start.go b/daemon/start.go index 1a5b0e7559..6c94fd5482 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -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) }