| commit | f72b180ae1f638b878edfbae1b7030f454bb5624 | [log] [tgz] |
|---|---|---|
| author | Brian Goff <cpuguy83@gmail.com> | Wed Jan 03 11:22:21 2018 -0500 |
| committer | GitHub <noreply@github.com> | Wed Jan 03 11:22:21 2018 -0500 |
| tree | 193a2b0768c33b4b5e6aef96f1c323109d775c85 | |
| parent | 99c22b0034605d283d9ddcfc72b1f450d130c976 [diff] | |
| parent | e51aec992624fec305176866f3937e0a120cecb8 [diff] |
Merge pull request #35694 from boucher/checkpoint-dir-fix Don't append the container id to custom directory checkpoints.
diff --git a/daemon/checkpoint.go b/daemon/checkpoint.go index 482e3b8..78930de 100644 --- a/daemon/checkpoint.go +++ b/daemon/checkpoint.go
@@ -22,7 +22,7 @@ var checkpointDir string var err2 error if checkDir != "" { - checkpointDir = filepath.Join(checkDir, ctrID, "checkpoints") + checkpointDir = checkDir } else { checkpointDir = ctrCheckpointDir }