Bladeren bron

Merge pull request #29200 from coolljt0725/fix_attach

fix #29199, reset container if container start failed
Michael Crosby 8 jaren geleden
bovenliggende
commit
a42ca21f50
1 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 3 2
      daemon/start.go

+ 3 - 2
daemon/start.go

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