Merge pull request #11 from LK4D4/fix_compile

Fix compilation for all tags

ctr/start.go

@@ -63,7 +63,7 @@ var StartCommand = cli.Command{
 			fatal("container id cannot be empty", 1)
 		}
 		c := v1.NewClient(context.GlobalString("addr"))
-		if err := c.Start(id, path); err != nil {
+		if err := c.Start(id, path, ""); err != nil {
 			fatal(err.Error(), 1)
 		}
 	},
@@ -89,7 +89,7 @@ var KillCommand = cli.Command{
 			fatal("container id cannot be empty", 1)
 		}
 		c := v1.NewClient(context.GlobalString("addr"))
-		if err := c.Signal(id, context.Int("pid"), context.Int("signal")); err != nil {
+		if err := c.SignalProcess(id, context.Int("pid"), context.Int("signal")); err != nil {
 			fatal(err.Error(), 1)
 		}
 	},

runc/runc.go

@@ -4,6 +4,7 @@ package runc
 
 import (
 	"encoding/json"
+	"errors"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -86,6 +87,26 @@ func (c *runcContainer) Pause() error {
 	return c.newCommand("pause").Run()
 }
 
+// TODO: pass arguments
+func (c *runcContainer) Checkpoint(runtime.Checkpoint) error {
+	return c.newCommand("checkpoint").Run()
+}
+
+// TODO: pass arguments
+func (c *runcContainer) Restore(cp string) error {
+	return c.newCommand("restore").Run()
+}
+
+// TODO: pass arguments
+func (c *runcContainer) DeleteCheckpoint(cp string) error {
+	return errors.New("not implemented")
+}
+
+// TODO: implement in runc
+func (c *runcContainer) Checkpoints() ([]runtime.Checkpoint, error) {
+	return nil, errors.New("not implemented")
+}
+
 func (c *runcContainer) newCommand(args ...string) *exec.Cmd {
 	cmd := exec.Command("runc", append([]string{"--root", c.stateDir, "--id", c.id}, args...)...)
 	cmd.Dir = c.path

supervisor_runc.go

@@ -0,0 +1,12 @@
+// +build runc
+
+package containerd
+
+import (
+	"github.com/docker/containerd/runc"
+	"github.com/docker/containerd/runtime"
+)
+
+func newRuntime(stateDir string) (runtime.Runtime, error) {
+	return runc.NewRuntime(stateDir)
+}

supervisor_unsupported.go

@@ -1,12 +1,13 @@
-// +build !libcontainer
+// +build !libcontainer,!runc
 
 package containerd
 
 import (
-	"github.com/docker/containerd/runc"
+	"errors"
+
 	"github.com/docker/containerd/runtime"
 )
 
 func newRuntime(stateDir string) (runtime.Runtime, error) {
-	return runc.NewRuntime(stateDir)
+	return nil, errors.New("unsupported platform")
 }