Merge pull request #398 from devimc/topic/imagebuilder/configureDockerRuntime

image-builder: make docker runtime configurable
This commit is contained in:
Julio Montes 2020-01-20 16:19:37 -06:00 committed by GitHub
commit 7526f4957d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,6 +8,8 @@ set -e
[ -n "${DEBUG}" ] && set -x
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
readonly script_name="${0##*/}"
readonly script_dir=$(dirname "$(readlink -f "$0")")
readonly lib_file="${script_dir}/../scripts/lib.sh"
@ -149,7 +151,7 @@ build_with_container() {
#https://github.com/clearcontainers/runtime/issues/828
"${container_engine}" run \
--rm \
--runtime runc \
--runtime "${DOCKER_RUNTIME}" \
--privileged \
--env AGENT_BIN="${agent_bin}" \
--env AGENT_INIT="${agent_init}" \