Don't append the container id to custom directory checkpoints. Fixes #34601.

boucher · boucher · commit e51aec992624 · 2017-12-04T14:24:35.000-05:00
Signed-off-by: Ross Boucher &lt;rboucher@gmail.com&gt;
diff --git a/daemon/checkpoint.go b/daemon/checkpoint.go
@@ -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
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func getCheckpointDir(checkDir, checkpointID, ctrName, ctrID, ctrCheckpointDir s`
`22`	`22`	`var checkpointDir string`
`23`	`23`	`var err2 error`
`24`	`24`	`if checkDir != "" {`
`25`		`- checkpointDir = filepath.Join(checkDir, ctrID, "checkpoints")`
	`25`	`+ checkpointDir = checkDir`
`26`	`26`	`} else {`
`27`	`27`	`checkpointDir = ctrCheckpointDir`
`28`	`28`	`}`