vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

execution: remove oci executor

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-01-18 14:38:32 -08:00
parent 0a58d55e63
commit 3f2d9d19bf
5 changed files with 1 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/containerd/main.go
View file

@ -20,7 +20,6 @@ import (
api "github.com/docker/containerd/api/execution"
"github.com/docker/containerd/events"
"github.com/docker/containerd/execution"
"github.com/docker/containerd/execution/executors/oci"
"github.com/docker/containerd/execution/executors/shim"
"github.com/docker/containerd/log"
metrics "github.com/docker/go-metrics"
@ -57,7 +56,7 @@ high performance container runtime
cli.StringFlag{
Name: "runtime",
Usage: "runtime for execution",
Value: "runc",
Value: "shim",
},
cli.StringFlag{
Name: "socket, s",
@ -119,11 +118,6 @@ high performance container runtime
runtime = context.GlobalString("runtime")
)
switch runtime {
case "runc":
executor, err = oci.New(context.GlobalString("root"))
if err != nil {
return err
}
case "shim":
root := filepath.Join(context.GlobalString("root"), "shim")
err = os.Mkdir(root, 0700)