Skip to content

K
k3s
Commit 0df8838d authored by tpetr's avatar tpetr
Browse files
Options

allow setting --cgroup-parent for docker run commands

parent 2986b37d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
build/common.sh
View file @ 0df8838d
...@@ -589,6 +589,11 @@ function kube::build::run_build_command_ex() { ...@@ -589,6 +589,11 @@ function kube::build::run_build_command_ex() {
--env "GOGCFLAGS=${GOGCFLAGS:-}" --env "GOGCFLAGS=${GOGCFLAGS:-}"
) )
if [ ! -z "${DOCKER_CGROUP_PARENT:-}" ]; then
kube::log::status "Using ${DOCKER_CGROUP_PARENT} as container cgroup parent"
docker_run_opts+=(--cgroup-parent "${DOCKER_CGROUP_PARENT}")
fi
# If we have stdin we can run interactive. This allows things like 'shell.sh' # If we have stdin we can run interactive. This allows things like 'shell.sh'
# to work. However, if we run this way and don't have stdin, then it ends up # to work. However, if we run this way and don't have stdin, then it ends up
# running in a daemon-ish mode. So if we don't have a stdin, we explicitly # running in a daemon-ish mode. So if we don't have a stdin, we explicitly
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment