diff options
| author | Adin Scannell <ascannell@google.com> | 2020-04-27 22:24:58 -0700 |
|---|---|---|
| committer | Adin Scannell <ascannell@google.com> | 2020-05-06 14:15:18 -0700 |
| commit | 508e25b6d6e9a81edb6ddf8738450b79898b446a (patch) | |
| tree | a7f6105ac25c8a879ed880e477d89ec6b6eb1a24 /tools | |
| parent | 8cb33ce5ded7d417710e7e749524b895deb20397 (diff) | |
Adapt website to use g3doc sources and bazel.
This adapts the merged website repository to use the image and bazel
build framework. It explicitly avoids the container_image rules provided
by bazel, opting instead to build with direct docker commands when
necessary.
The relevant build commands are incorporated into the top-level
Makefile.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bazel.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/bazel.mk b/tools/bazel.mk index 45fbbecca..a2ded7846 100644 --- a/tools/bazel.mk +++ b/tools/bazel.mk @@ -34,6 +34,14 @@ FULL_DOCKER_RUN_OPTIONS := $(DOCKER_RUN_OPTIONS) FULL_DOCKER_RUN_OPTIONS += -v "$(BAZEL_CACHE):$(BAZEL_CACHE)" FULL_DOCKER_RUN_OPTIONS += -v "$(GCLOUD_CONFIG):$(GCLOUD_CONFIG)" FULL_DOCKER_RUN_OPTIONS += -v "$(DOCKER_SOCKET):$(DOCKER_SOCKET)" +DOCKER_GROUP := $(shell stat -c '%g' $(DOCKER_SOCKET)) +ifneq ($(GID),$(DOCKER_GROUP)) +USERADD_OPTIONS := --groups $(DOCKER_GROUP) +DOCKER_GROUP_OPTIONS := --group-add $(DOCKER_GROUP) +else +USERADD_OPTIONS := +DOCKER_GROUP_OPTIONS := +endif ## ## Bazel helpers. @@ -51,7 +59,7 @@ FULL_DOCKER_RUN_OPTIONS += -v "$(DOCKER_SOCKET):$(DOCKER_SOCKET)" bazel-server-start: load-default ## Starts the bazel server. docker run -d --rm \ --name $(DOCKER_NAME) \ - --user 0:0 \ + --user 0:0 $(DOCKER_GROUP_OPTIONS) \ -v "$(CURDIR):$(CURDIR)" \ --workdir "$(CURDIR)" \ --tmpfs /tmp:rw,exec \ @@ -59,7 +67,7 @@ bazel-server-start: load-default ## Starts the bazel server. $(FULL_DOCKER_RUN_OPTIONS) \ gvisor.dev/images/default \ sh -c "groupadd --gid $(GID) --non-unique $(USER) && \ - useradd --uid $(UID) --non-unique --no-create-home --gid $(GID) -d $(HOME) $(USER) && \ + useradd --uid $(UID) --non-unique --no-create-home --gid $(GID) $(USERADD_OPTIONS) -d $(HOME) $(USER) && \ bazel version && \ while :; do sleep 3600; done" @while :; do if docker logs $(DOCKER_NAME) 2>/dev/null | grep "Build label:" >/dev/null; then break; fi; sleep 1; done |