kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix checkpoint's exiting semantics.

Browse source 
Previously, dockerd would always ask containerd to pass --leave-running
to runc/runsc, ignoring the exit boolean value. Hence, even `docker
checkpoint create --leave-running=false ...` would not stop the
container.

Signed-off-by: Brielle Broder <bbroder@google.com>
This commit is contained in:
Brielle Broder 2018-06-27 17:53:12 -07:00 • committed by Vincent Demeester
parent 1ef1cc8388
commit db621eb7ee
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libcontainerd/client_daemon.go
View file

@ -561,7 +561,11 @@ func (c *client) CreateCheckpoint(ctx context.Context, containerID, checkpointDi
return err return err
} }
img, err := p.(containerd.Task).Checkpoint(ctx) opts := []containerd.CheckpointTaskOpts{}
if exit {
opts = append(opts, containerd.WithExit)
}
img, err := p.(containerd.Task).Checkpoint(ctx, opts...)
if err != nil { if err != nil {
return wrapError(err) return wrapError(err)
} }