Add support for specifying the logging dir

Author: boucher

api/client/checkpoint.go

@@ -6,21 +6,12 @@ import (
   "github.com/docker/libcontainer"
 )
 
-/*
-type CriuOpts struct {
-    ImagesDirectory             string // directory for storing image files
-    PreviousImagesDirectory     string // path to images from previous dump (relative to --images-directory)
-    LeaveRunning                Bool   // leave container in running state after checkpoint
-    TcpEstablished              bool   // checkpoint/restore established TCP connections
-    ExternalUnixConnections     bool   // allow external unix connections
-    ShellJob                    bool   // allow to dump and restore shell jobs
-}*/
-
 func (cli *DockerCli) CmdCheckpoint(args ...string) error {
     cmd := cli.Subcmd("checkpoint", "CONTAINER [CONTAINER...]", "Checkpoint one or more running containers", true)
 
     var (
         flImgDir       = cmd.String([]string{"-image-dir"}, "", "(optional) directory for storing checkpoint image files")
+        flWorkDir      = cmd.String([]string{"-work-dir"}, "", "directory for storing log file")
         flPrevImgDir   = cmd.String([]string{"-prev-image-dir"}, "", "path to images from previous dump (relative to --checkpoint-image-dir)")
         flLeaveRunning = cmd.Bool([]string{"-leave-running"}, false, "leave the container running after checkpointing")
         flCheckTcp     = cmd.Bool([]string{"-allow-tcp"}, false, "allow checkpointing established tcp connections")
@@ -39,6 +30,7 @@ func (cli *DockerCli) CmdCheckpoint(args ...string) error {
 
     criuOpts := &libcontainer.CriuOpts{
         ImagesDirectory:         *flImgDir,
+        WorkDirectory:           *flWorkDir,
         PreviousImagesDirectory: *flPrevImgDir,
         LeaveRunning:            *flLeaveRunning,
         TcpEstablished:          *flCheckTcp,

api/client/restore.go

@@ -11,6 +11,7 @@ func (cli *DockerCli) CmdRestore(args ...string) error {
 
     var (
         flImgDir       = cmd.String([]string{"-image-dir"}, "", "(optional) directory to restore image files from")
+        flWorkDir      = cmd.String([]string{"-work-dir"}, "", "directory to store temp files and restore.log")
         flCheckTcp     = cmd.Bool([]string{"-allow-tcp"}, false, "allow restoring tcp connections")
         flExtUnix      = cmd.Bool([]string{"-allow-ext-unix"}, false, "allow restoring external unix connections")
         flShell        = cmd.Bool([]string{"-allow-shell"}, false, "allow restoring shell jobs")
@@ -27,6 +28,7 @@ func (cli *DockerCli) CmdRestore(args ...string) error {
 
     criuOpts := &libcontainer.CriuOpts{
         ImagesDirectory:         *flImgDir,
+        WorkDirectory:           *flWorkDir,
         TcpEstablished:          *flCheckTcp,
         ExternalUnixConnections: *flExtUnix,
         ShellJob:                *flShell,

daemon/checkpoint.go

@@ -27,6 +27,9 @@ func (daemon *Daemon) ContainerCheckpoint(job *engine.Job) error {
    if job.EnvExists("ImagesDirectory") {
       opts.ImagesDirectory = job.Getenv("ImagesDirectory")
    }
+   if job.EnvExists("WorkDirectory") {
+      opts.WorkDirectory = job.Getenv("WorkDirectory")
+   }
    if job.EnvExists("PreviousImagesDirectory") {
       opts.PreviousImagesDirectory = job.Getenv("PreviousImagesDirectory")
    }
@@ -79,6 +82,9 @@ func (daemon *Daemon) ContainerRestore(job *engine.Job) error {
    if job.EnvExists("ImagesDirectory") {
       opts.ImagesDirectory = job.Getenv("ImagesDirectory")
    }
+   if job.EnvExists("WorkDirectory") {
+      opts.ImagesDirectory = job.Getenv("WorkDirectory")
+   }
    if job.EnvExists("TcpEstablished") {
       opts.TcpEstablished = job.GetenvBool("TcpEstablished")
    }

daemon/container.go

@@ -395,53 +395,6 @@ func populateCommand(c *Container, env []string) error {
 	return nil
 }
 
-// Like populateCommand() but for restoring a container.
-//
-// XXX populateCommand() does a lot more.  Not sure if we have
-//     to do everything it does.
-func populateCommandRestore(c *Container, env []string) error {
-	resources := &execdriver.Resources{
-		Memory:     c.hostConfig.Memory,
-		MemorySwap: c.hostConfig.MemorySwap,
-		CpuShares:  c.hostConfig.CpuShares,
-		CpusetCpus: c.hostConfig.CpusetCpus,
-	}
-
-	processConfig := execdriver.ProcessConfig{
-		Privileged: c.hostConfig.Privileged,
-		Entrypoint: c.Path,
-		Arguments:  c.Args,
-		Tty:        c.Config.Tty,
-		User:       c.Config.User,
-	}
-
-	processConfig.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
-	processConfig.Env = env
-
-	c.command = &execdriver.Command{
-		ID:             c.ID,
-		Rootfs:         c.RootfsPath(),
-		ReadonlyRootfs: c.hostConfig.ReadonlyRootfs,
-		InitPath:       "/.dockerinit",
-		WorkingDir:     c.Config.WorkingDir,
-		// Network:     en,
-		// Ipc:         ipc,
-		// Pid:         pid,
-		Resources: resources,
-		// AllowedDevices: allowedDevices,
-		// AutoCreatedDevices: autoCreatedDevices,
-		CapAdd:        c.hostConfig.CapAdd,
-		CapDrop:       c.hostConfig.CapDrop,
-		ProcessConfig: processConfig,
-		ProcessLabel:  c.GetProcessLabel(),
-		MountLabel:    c.GetMountLabel(),
-		// LxcConfig:  lxcConfig,
-		AppArmorProfile: c.AppArmorProfile,
-	}
-
-	return nil
-}
-
 func (container *Container) Start() (err error) {
 	container.Lock()
 	defer container.Unlock()
@@ -1016,8 +969,6 @@ func (container *Container) Checkpoint(opts *libcontainer.CriuOpts) error {
 	return container.daemon.Checkpoint(container, opts)
 }
 
-// Like waitForStart() but for restoring a container.
-//
 // XXX Start() does a lot more.  Not sure if we have
 //     to do everything it does.
 func (container *Container) Restore(opts *libcontainer.CriuOpts) error {