Allow providing a custom storage directory for docker checkpoints

Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: bd7d51292c399edba5f339e6be55fac6c0811ff5
Component: engine

components/engine/cli/command/container/start.go

@@ -17,10 +17,11 @@ import (
 )
 
 type startOptions struct {
-	attach     bool
-	openStdin  bool
-	detachKeys string
-	checkpoint string
+	attach        bool
+	openStdin     bool
+	detachKeys    string
+	checkpoint    string
+	checkpointDir string
 
 	containers []string
 }
@@ -46,6 +47,7 @@ func NewStartCommand(dockerCli *command.DockerCli) *cobra.Command {
 
 	if dockerCli.HasExperimental() {
 		flags.StringVar(&opts.checkpoint, "checkpoint", "", "Restore from this checkpoint")
+		flags.StringVar(&opts.checkpointDir, "checkpoint-dir", "", "Use a custom checkpoint storage directory")
 	}
 
 	return cmd
@@ -112,7 +114,8 @@ func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
 		// no matter it's detached, removed on daemon side(--rm) or exit normally.
 		statusChan := waitExitOrRemoved(dockerCli, ctx, c.ID, c.HostConfig.AutoRemove)
 		startOptions := types.ContainerStartOptions{
-			CheckpointID: opts.checkpoint,
+			CheckpointID:  opts.checkpoint,
+			CheckpointDir: opts.checkpointDir,
 		}
 
 		// 4. Start the container.
@@ -145,7 +148,8 @@ func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
 		}
 		container := opts.containers[0]
 		startOptions := types.ContainerStartOptions{
-			CheckpointID: opts.checkpoint,
+			CheckpointID:  opts.checkpoint,
+			CheckpointDir: opts.checkpointDir,
 		}
 		return dockerCli.Client().ContainerStart(ctx, container, startOptions)