mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-03 03:21:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1214 from kinvolk/jepio/containerd-config-fix

Browse Source 
explicitly set 'runtime_type' in containerd config
This commit is contained in:
Jeremi Piotrowski 2021-08-24 10:33:41 +02:00 committed by GitHub
commit 5bc0c080f3
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.5.5-r1.ebuild vendored
View File

10
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config-cgroupfs.toml vendored
View File

@ -1,3 +1,5 @@
version = 2
# persistent data location # persistent data location
root = "/var/lib/containerd" root = "/var/lib/containerd"
# runtime state information # runtime state information
@ -16,7 +18,7 @@ uid = 0
# socket gid # socket gid
gid = 0 gid = 0
[plugins.linux] [plugins."containerd.runtime.v1.linux"]
# shim binary name/path # shim binary name/path
shim = "containerd-shim" shim = "containerd-shim"
# runtime binary name/path # runtime binary name/path
@ -25,6 +27,8 @@ runtime = "runc"
# live restore is not supported # live restore is not supported
no_shim = false no_shim = false
# config version 1; version 2 uses full plugin paths [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
[plugins.cri.containerd.runtimes.runc.options] # setting runc.options unsets parent settings
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = false SystemdCgroup = false

10
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml vendored
View File

@ -1,3 +1,5 @@
version = 2
# persistent data location # persistent data location
root = "/var/lib/containerd" root = "/var/lib/containerd"
# runtime state information # runtime state information
@ -16,7 +18,7 @@ uid = 0
# socket gid # socket gid
gid = 0 gid = 0
[plugins.linux] [plugins."containerd.runtime.v1.linux"]
# shim binary name/path # shim binary name/path
shim = "containerd-shim" shim = "containerd-shim"
# runtime binary name/path # runtime binary name/path
@ -25,6 +27,8 @@ runtime = "runc"
# live restore is not supported # live restore is not supported
no_shim = false no_shim = false
# config version 1; version 2 uses full plugin paths [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
[plugins.cri.containerd.runtimes.runc.options] # setting runc.options unsets parent settings
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true SystemdCgroup = true