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

Merge pull request #1114 from Random-Liu/fix-extra-handler

Browse Source 
Use local env to avoid writing to passed-in readonly env.
This commit is contained in:
Lantao Liu 2019-04-03 18:48:37 -07:00 committed by GitHub
commit 63ad4c7305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/configure.sh
View File

@ -181,14 +181,14 @@ disabled_plugins = ["restart"]
EOF
chmod 644 "${config_path}"
# CONTAINERD_EXTRA_RUNTIME_HANDLER is the extra runtime handler to install.
CONTAINERD_EXTRA_RUNTIME_HANDLER=${CONTAINERD_EXTRA_RUNTIME_HANDLER:-""}
if [[ -n "${CONTAINERD_EXTRA_RUNTIME_HANDLER}" ]]; then
# containerd_extra_runtime_handler is the extra runtime handler to install.
containerd_extra_runtime_handler=${CONTAINERD_EXTRA_RUNTIME_HANDLER:-""}
if [[ -n "${containerd_extra_runtime_handler}" ]]; then
cat >> ${config_path} <<EOF
[plugins.cri.containerd.runtimes.${CONTAINERD_EXTRA_RUNTIME_HANDLER}]
[plugins.cri.containerd.runtimes.${containerd_extra_runtime_handler}]
runtime_type = "${CONTAINERD_EXTRA_RUNTIME_TYPE:-io.containerd.runc.v1}"
[plugins.cri.containerd.runtimes.${CONTAINERD_EXTRA_RUNTIME_HANDLER}.options]
[plugins.cri.containerd.runtimes.${containerd_extra_runtime_handler}.options]
${CONTAINERD_EXTRA_RUNTIME_OPTIONS:-}
EOF
fi