mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
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
This commit is contained in:
committed by
gVisor bot
parent
ad0ac73626
commit
be2b9d75d7
+2
-6
@@ -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:
|
||||
@
|
||||
|
||||
Reference in New Issue
Block a user