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

Merge pull request #1584 from containerd/revert-1530-fix-doc-for-runtime-options

Browse Source 
Revert "Fix doc for runtime specific options"
This commit is contained in:
Mike Brown 2020-09-22 09:09:50 -05:00 committed by GitHub
commit c178043f6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
docs/config.md
View File

@ -169,38 +169,38 @@ version = 2
# "io.containerd.runc.v1" and "io.containerd.runc.v2". Its corresponding options type is: # "io.containerd.runc.v1" and "io.containerd.runc.v2". Its corresponding options type is:
# https://github.com/containerd/containerd/blob/v1.3.2/runtime/v2/runc/options/oci.pb.go#L26 . # https://github.com/containerd/containerd/blob/v1.3.2/runtime/v2/runc/options/oci.pb.go#L26 .
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
# no_pivot_root disables pivot root when creating a container. # NoPivotRoot disables pivot root when creating a container.
no_pivot_root = false NoPivotRoot = false
# no_new_keyring disables new keyring for the container. # NoNewKeyring disables new keyring for the container.
no_new_keyring = false NoNewKeyring = false
# shim_cgroup places the shim in a cgroup. # ShimCgroup places the shim in a cgroup.
shim_cgroup = "" ShimCgroup = ""
# io_uid sets the I/O's pipes uid. # IoUid sets the I/O's pipes uid.
io_uid = 0 IoUid = 0
# io_gid sets the I/O's pipes gid. # IoGid sets the I/O's pipes gid.
io_gid = 0 IoGid = 0
# binary_name is the binary name of the runc binary. # BinaryName is the binary name of the runc binary.
binary_name = "" BinaryName = ""
# root is the runc root directory. # Root is the runc root directory.
root = "" Root = ""
# criu_path is the criu binary path. # CriuPath is the criu binary path.
criu_path = "" CriuPath = ""
# systemd_cgroup enables systemd cgroups. # SystemdCgroup enables systemd cgroups.
systemd_cgroup = false SystemdCgroup = false
# criu_image_path is the criu image path # CriuImagePath is the criu image path
criu_image_path = "" CriuImagePath = ""
# criu_work_path is the criu work path. # CriuWorkPath is the criu work path.
criu_work_path = "" CriuWorkPath = ""
# 'plugins."io.containerd.grpc.v1.cri".cni' contains config related to cni # 'plugins."io.containerd.grpc.v1.cri".cni' contains config related to cni
[plugins."io.containerd.grpc.v1.cri".cni] [plugins."io.containerd.grpc.v1.cri".cni]