Skip to content

Commit

Permalink
Drop shutdown in docker run.
Browse files Browse the repository at this point in the history
This can race and cause issues. Instead, a manual shutdown can be done
via 'bazel-shutdown' if required for specific cases. The ARM64 builds
are now done using cross-compilation, so this hack is not necessary.

PiperOrigin-RevId: 351477908
  • Loading branch information
amscanne authored and gvisor-bot committed Jan 13, 2021
1 parent ad0ac73 commit be2b9d7
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions tools/bazel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,7 @@ bazel-image: load-default ## Ensures that the local builder exists.
.PHONY: bazel-image

# Note: when starting the bazel server, we tie the life of the container to the
# bazel server's life, so that the container disappears naturally. We also call
# bazel shutdown prior to startup, to ensure that any existing bazel instance in
# the workspace (perhaps of a different architecture) stops. If the instance is
# compatible and the container is already running, then the wrapper if statement
# here will succeed, and we wouldn't have needed a new server at all.
# bazel server's life, so that the container disappears naturally.
ifneq (true,$(shell $(wrapper echo true)))
bazel-server: bazel-image ## Ensures that the server exists.
@$(call header,DOCKER RUN)
Expand All @@ -177,7 +173,7 @@ bazel-server: bazel-image ## Ensures that the server exists.
--workdir "$(CURDIR)" \
$(DOCKER_RUN_OPTIONS) \
gvisor.dev/images/builder \
bash -c "set -x; $(BAZEL) shutdown; tail -f --pid=\$$($(BAZEL) info server_pid) /dev/null"
bash -c "set -x; tail -f --pid=\$$($(BAZEL) info server_pid) /dev/null"
else
bazel-server:
@
Expand Down

0 comments on commit be2b9d7

Please sign in to comment.