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

Merge pull request #4963 from zhsj/move-runtimeopt

Browse Source 
Move runtimeoptions out of cri package
This commit is contained in:
Derek McGowan
2021-01-22 11:43:08 -08:00
committed by GitHub
parent 9e78a001b9 2818fdebaa
commit aae24ecbce
4 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/run/run_unix.go
View File

@@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/contrib/nvidia"
"github.com/containerd/containerd/contrib/seccomp"
"github.com/containerd/containerd/oci"
crioptions "github.com/containerd/containerd/pkg/cri/runtimeoptions/v1"
runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/opencontainers/runtime-spec/specs-go"
@@ -316,7 +316,7 @@ func getRuntimeOptions(context *cli.Context) (interface{}, error) {
}
if configPath := context.String("runtime-config-path"); configPath != "" {
return &crioptions.Options{
return &runtimeoptions.Options{
ConfigPath: configPath,
}, nil
}