diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-03 00:58:36 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-03 01:00:21 -0800 |
| commit | 80552b936d06e43ea77df09a6b6c5ce2600a6f6a (patch) | |
| tree | 3b5da161e417bb06e6eacbcc868f070ec0fc1e48 /tools/bazel.mk | |
| parent | f9339526875fa60d41be285090435bf400ad39e6 (diff) | |
Support partitions for other tests.
PiperOrigin-RevId: 345399936
Diffstat (limited to 'tools/bazel.mk')
| -rw-r--r-- | tools/bazel.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/bazel.mk b/tools/bazel.mk index 9063eebaf..ca5621a9c 100644 --- a/tools/bazel.mk +++ b/tools/bazel.mk @@ -41,6 +41,9 @@ DOCKER_CONFIG := /etc/docker # Bazel flags. BAZEL := bazel $(STARTUP_OPTIONS) BASE_OPTIONS := --color=no --curses=no +ifneq (,$(BAZEL_CONFIG)) +BASE_OPTIONS += --config=$(BAZEL_CONFIG) +endif # Basic options. UID := $(shell id -u ${USER}) @@ -103,11 +106,6 @@ FULL_DOCKER_RUN_OPTIONS += --group-add $(KVM_GROUP) endif endif -# Load the appropriate config. -ifneq (,$(BAZEL_CONFIG)) -OPTIONS += --config=$(BAZEL_CONFIG) -endif - bazel-image: load-default @if docker ps --all | grep $(BUILDER_NAME); then docker rm -f $(BUILDER_NAME); fi docker run --user 0:0 --entrypoint "" --name $(BUILDER_NAME) \ |