From 9a75fc101c90209d67836e260664225d73b52faa Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Fri, 4 Sep 2015 19:48:46 +0500 Subject: [PATCH] detect /dev/kvm or optionally force --privileged using PRIVILEGED=1 in ./scripts/docker-run.sh --- scripts/docker-run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh index 5a4c56d3..4993ab9b 100755 --- a/scripts/docker-run.sh +++ b/scripts/docker-run.sh @@ -8,6 +8,9 @@ if [ -n "$BIND_DIR" ]; then fi DOCKER_ARGS="-t -v $BIND_DIR:/go/src/github.com/rancherio/os" fi +if [ -c /dev/kvm ] || [ "${PRIVILEGED}" == "1" ]; then + DOCKER_ARGS="${DOCKER_ARGS} --privileged" +fi docker rm -fv ros-build >/dev/null 2>&1 || true -exec docker run --privileged -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@" +exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@"