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

Merge pull request #1439 from mlaventure/allow-setting-rutime-opts

Browse Source 
Allow setting runtime options when using WithRuntime()
This commit is contained in:
Phil Estes
2017-08-30 15:59:14 -04:00
committed by GitHub
parent 49e3d43ff2 42b131c1f3
commit 0baecaa7cf
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/run_unix.go
View File

@@ -99,7 +99,7 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
cOpts = append(cOpts, containerd.WithNewSnapshot(id, image))
}
}
cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime")))
cOpts = append(cOpts, containerd.WithRuntime(context.String("runtime"), nil))
opts = append(opts, withEnv(context), withMounts(context))
if len(args) > 0 {

2
cmd/ctr/run_windows.go
View File

@@ -111,7 +111,7 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
return client.NewContainer(ctx, id,
containerd.WithNewSpec(opts...),
containerd.WithContainerLabels(labels),
containerd.WithRuntime(context.String("runtime")),
containerd.WithRuntime(context.String("runtime"), nil),
// TODO(mlaventure): containerd.WithImage(image),
)
}