Merge pull request #1069 from tallclair/runtimehandler-setup

Expose environment variables for configuring an additional runtime handler
This commit is contained in:
Lantao Liu 2019-03-14 00:22:42 -07:00 committed by GitHub
commit 9c9bf1d7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -181,6 +181,16 @@ disabled_plugins = ["restart"]
EOF EOF
chmod 644 "${config_path}" chmod 644 "${config_path}"
if [[ -n "${CONTAINERD_EXTRA_RUNTIME_HANDLER}" ]]; then
cat >> ${config_path} <<EOF
[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]
${CONTAINERD_EXTRA_RUNTIME_OPTIONS:-}
EOF
fi
echo "export PATH=${CONTAINERD_HOME}/usr/local/bin/:${CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \ echo "export PATH=${CONTAINERD_HOME}/usr/local/bin/:${CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \
/etc/profile.d/containerd_env.sh /etc/profile.d/containerd_env.sh