github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2425 from avagin/docker-fixes

Browse Source 
task: allow to specify namespaces which are restored externally
This commit is contained in:
Michael Crosby 2018-07-25 10:26:08 -04:00 committed by GitHub
commit 26e2dd6754
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ctr/commands/tasks/checkpoint.go
View File

@ -78,12 +78,22 @@ func withExit(rt string) containerd.CheckpointTaskOpts {
return func(r *containerd.CheckpointTaskInfo) error { return func(r *containerd.CheckpointTaskInfo) error {
switch rt { switch rt {
case "io.containerd.runc.v1": case "io.containerd.runc.v1":
r.Options = &options.CheckpointOptions{ if r.Options == nil {
Exit: true, r.Options = &options.CheckpointOptions{
Exit: true,
}
} else {
opts, _ := r.Options.(*options.CheckpointOptions)
opts.Exit = true
} }
default: default:
r.Options = &runctypes.CheckpointOptions{ if r.Options == nil {
Exit: true, r.Options = &runctypes.CheckpointOptions{
Exit: true,
}
} else {
opts, _ := r.Options.(*runctypes.CheckpointOptions)
opts.Exit = true
} }
} }
return nil return nil