8a8f6f6124
If Windows updates are being applied via a RUN command in a docker build, the build will not stop if there was a failure in postRunProcessing. To enable this behavior, we explicitly set the exit code of the container to a failure if postRunProcessing fails during servicing container step. For completeness, also avoid running servicing operation if the original exit code of the container is non-zero so that original failure exit code does not get overwritten. Signed-off-by: Stefan J. Wernli <swernli@microsoft.com> Upstream-commit: 2266e7f2345c88a8e195fd959550d0d657bec843 Component: engine
38 lines
1.1 KiB
Go
38 lines
1.1 KiB
Go
package daemon
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/libcontainerd"
|
|
)
|
|
|
|
// platformConstructExitStatus returns a platform specific exit status structure
|
|
func platformConstructExitStatus(e libcontainerd.StateInfo) *container.ExitStatus {
|
|
return &container.ExitStatus{
|
|
ExitCode: int(e.ExitCode),
|
|
}
|
|
}
|
|
|
|
// 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.ExitCode == 0 && e.UpdatePending {
|
|
spec, err := daemon.createSpec(container)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
servicingOption := &libcontainerd.ServicingOption{
|
|
IsServicing: true,
|
|
}
|
|
|
|
// 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)
|
|
}
|
|
}
|
|
return nil
|
|
}
|