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

Enable runc.v2 as the default runtime in test.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2019-04-03 18:47:25 -07:00
committed by Derek McGowan
parent d19aa0fd2e
commit e6e272e740
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/gce/configure.sh
View File

@@ -164,10 +164,6 @@ disabled_plugins = ["restart"]
[debug] [debug]
level = "${log_level}" level = "${log_level}"
[plugins.linux]
shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim"
runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc"
[plugins.cri] [plugins.cri]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
stream_server_port = "0" stream_server_port = "0"
@@ -178,6 +174,10 @@ disabled_plugins = ["restart"]
conf_template = "${cni_template_path}" conf_template = "${cni_template_path}"
[plugins.cri.registry.mirrors."docker.io"] [plugins.cri.registry.mirrors."docker.io"]
endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"] endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"]
[plugins.cri.containerd.default_runtime]
runtime_type = "io.containerd.runc.v2"
[plugins.cri.containerd.default_runtime.options]
BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc"
EOF EOF
chmod 644 "${config_path}" chmod 644 "${config_path}"