Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #269 from stefanha/rootfs-DOCKER_RUNTIME-env-var
Browse files Browse the repository at this point in the history
rootfs-builder: add rootfs.sh DOCKER_RUNTIME env var
  • Loading branch information
Julio Montes authored Apr 1, 2019
2 parents e8bb3bc + c72c954 commit 22d1bc5
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion rootfs-builder/rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AGENT_BIN=${AGENT_BIN:-kata-agent}
AGENT_INIT=${AGENT_INIT:-no}
KERNEL_MODULES_DIR=${KERNEL_MODULES_DIR:-""}
OSBUILDER_VERSION="unknown"
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
export GOPATH=${GOPATH:-${HOME}/go}

lib_file="${script_dir}/../scripts/lib.sh"
Expand Down Expand Up @@ -103,6 +104,9 @@ USE_DOCKER If set, build the rootfs inside a container (requires
Docker).
Default value: <not set>
DOCKER_RUNTIME Docker runtime to use when USE_DOCKER is set.
Default value: runc
Refer to the Platform-OS Compatibility Matrix for more details on the supported
architectures:
https://github.com/kata-containers/osbuilder#platform-distro-compatibility-matrix
Expand Down Expand Up @@ -321,7 +325,7 @@ if [ -n "${USE_DOCKER}" ] ; then

docker_run_args=""
docker_run_args+=" --rm"
docker_run_args+=" --runtime runc"
docker_run_args+=" --runtime ${DOCKER_RUNTIME}"

if [ -z "${AGENT_SOURCE_BIN}" ] ; then
docker_run_args+=" --env GO_AGENT_PKG=${GO_AGENT_PKG}"
Expand Down

0 comments on commit 22d1bc5

Please sign in to comment.