Merge pull request #35694 from boucher/checkpoint-dir-fix

Don't append the container id to custom directory checkpoints.
Upstream-commit: f72b180ae1f638b878edfbae1b7030f454bb5624
Component: engine
This commit is contained in:
Brian Goff
2018-01-03 11:22:21 -05:00
committed by GitHub
+1 -1
View File
@@ -22,7 +22,7 @@ func getCheckpointDir(checkDir, checkpointID, ctrName, ctrID, ctrCheckpointDir s
var checkpointDir string
var err2 error
if checkDir != "" {
checkpointDir = filepath.Join(checkDir, ctrID, "checkpoints")
checkpointDir = checkDir
} else {
checkpointDir = ctrCheckpointDir
}