github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #382 from runcom/not-only-runc

Browse Source 
cmd/containerd: extend to other OCI runtimes
This commit is contained in:
Michael Crosby
2017-01-10 09:26:21 -08:00
committed by GitHub
parent 549b20711f 98b39002ba
commit 4c848c4654
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/containerd/main.go
View File

@@ -55,7 +55,7 @@ high performance container runtime
}, },
cli.StringFlag{ cli.StringFlag{
Name: "runtime", Name: "runtime",
Usage: "default runtime for execution", Usage: "runtime for execution",
Value: "runc", Value: "runc",
}, },
cli.StringFlag{ cli.StringFlag{
@@ -103,13 +103,18 @@ high performance container runtime
return err return err
} }
var executor execution.Executor var (
switch context.GlobalString("runtime") { executor execution.Executor
runtime = context.GlobalString("runtime")
)
switch runtime {
case "runc": case "runc":
executor, err = oci.New(context.GlobalString("root")) executor, err = oci.New(context.GlobalString("root"))
if err != nil { if err != nil {
return err return err
} }
default:
return fmt.Errorf("oci: runtime %q not implemented", runtime)
} }
// Get events publisher // Get events publisher