Merge pull request #569 from crosbymichael/linux-builtin

Change linux runtime(w shim) to builtin

cmd/containerd/builtins.go

@@ -2,6 +2,7 @@ package main
 
 // register containerd builtins here
 import (
+	_ "github.com/docker/containerd/linux"
 	_ "github.com/docker/containerd/services/content"
 	_ "github.com/docker/containerd/services/execution"
 )

linux/Makefile

@@ -1,7 +0,0 @@
-
-all:
-	go build -buildmode=plugin -o shim-linux-amd64.so
-
-install:
-	mkdir -p /var/lib/containerd/plugins
-	cp shim-linux-amd64.so /var/lib/containerd/plugins/

linux/container.go

@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"github.com/docker/containerd"

linux/main.go

@@ -1,5 +0,0 @@
-package main
-
-func main() {
-	panic("build as plugin not executable")
-}

linux/runtime.go

@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"bytes"

linux/shim.go

@@ -1,4 +1,4 @@
-package main
+package linux
 
 import (
 	"fmt"