diff options
| author | Adin Scannell <ascannell@google.com> | 2021-01-12 16:59:23 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-12 17:02:11 -0800 |
| commit | be2b9d75d75e0e7371cd868589d57f4ddee44781 (patch) | |
| tree | 4a3553735dcfb39bc0ae0caba51feb1adf92a6ad /tools | |
| parent | ad0ac73626c3d65712791eba652c05869ed287f8 (diff) | |
Drop shutdown in docker run.
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bazel.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/bazel.mk b/tools/bazel.mk index 0a10bcddf..2b20457e9 100644 --- a/tools/bazel.mk +++ b/tools/bazel.mk @@ -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) @@ -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: @ |