docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

Merge pull request #23328 from swernli/servicingFix

Browse Source 
Fix postRunProcessing behavior during docker build
Upstream-commit: cc03a422aaa976568dcb423ebb518b0c40e9e66a
Component: engine
This commit is contained in:
Alexander Morozov
2016-06-07 09:49:28 -07:00
parent 4d60d70438 8a8f6f6124
commit e336aa95df
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/monitor_windows.go
View File

@@ -16,7 +16,7 @@ func platformConstructExitStatus(e libcontainerd.StateInfo) *container.ExitStatu
// postRunProcessing perfoms any processing needed on the container after it has stopped.
func (daemon *Daemon) postRunProcessing(container *container.Container, e libcontainerd.StateInfo) error {
if e.UpdatePending {
if e.ExitCode == 0 && e.UpdatePending {
spec, err := daemon.createSpec(container)
if err != nil {
return err
@@ -29,6 +29,7 @@ func (daemon *Daemon) postRunProcessing(container *container.Container, e libcon
// Create a new servicing container, which will start, complete the update, and merge back the
// results if it succeeded, all as part of the below function call.
if err := daemon.containerd.Create((container.ID + "_servicing"), *spec, servicingOption); err != nil {
container.ExitCode = -1
return fmt.Errorf("Post-run update servicing failed: %s", err)
}
}