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

Merge pull request #1531 from mikebrow/nit-for-default-config

Browse Source 
show runc options tag
This commit is contained in:
Mike Brown 2020-07-11 11:47:00 -05:00 committed by GitHub
commit 5df93a038a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/config/config_unix.go
View File

@ -19,6 +19,7 @@
package config package config
import ( import (
"github.com/BurntSushi/toml"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/cri/pkg/streaming" "github.com/containerd/cri/pkg/streaming"
) )
@ -38,7 +39,8 @@ func DefaultConfig() PluginConfig {
NoPivot: false, NoPivot: false,
Runtimes: map[string]Runtime{ Runtimes: map[string]Runtime{
"runc": { "runc": {
Type: "io.containerd.runc.v2", Type: "io.containerd.runc.v2",
Options: new(toml.Primitive),
}, },
}, },
}, },