Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2018
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Don't append the container id to custom directory checkpoints. Fixes #… 
…34601.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
  • Loading branch information
@boucher
boucher committed Dec 4, 2017
commit e51aec992624fec305176866f3937e0a120cecb8
2 changes: 1 addition & 1 deletion daemon/checkpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down