summaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-24 14:34:13 -0800
committergVisor bot <gvisor-bot@google.com>2020-02-24 14:34:13 -0800
commit93626a28e4120c5eccdf4b36f071b93b2210714f (patch)
tree6e999e7d75d3dd5195ac6da67ef2634a7d68893d /Makefile
parentededa90d07e4df3eb3fe8a52a0afbcdaf82e8df5 (diff)
parent75d7f76a6cd81d77f5ce70440c1d95c0296b15ba (diff)
Merge pull request #1886 from avagin:arm64-travis-ci
PiperOrigin-RevId: 296975376
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a73bc0c36..d9531fbd5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ UID := $(shell id -u ${USER})
GID := $(shell id -g ${USER})
GVISOR_BAZEL_CACHE := $(shell readlink -f ~/.cache/bazel/)
+# The --privileged is required to run tests.
+DOCKER_RUN_OPTIONS ?= --privileged
+
all: runsc
docker-build:
@@ -19,7 +22,7 @@ bazel-server-start: docker-build
-v "$(CURDIR):$(CURDIR)" \
--workdir "$(CURDIR)" \
--tmpfs /tmp:rw,exec \
- --privileged \
+ $(DOCKER_RUN_OPTIONS) \
gvisor-bazel \
sh -c "while :; do sleep 100; done" && \
docker exec --user 0:0 -i gvisor-bazel sh -c "groupadd --gid $(GID) --non-unique gvisor && useradd --uid $(UID) --non-unique --gid $(GID) -d $(HOME) gvisor"