go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix run and sudo targets. 

These are not passing arguments properly. This breaks the current
pre-command for BuildKite.

PiperOrigin-RevId: 347062729
This commit is contained in:
Adin Scannell 2020-12-11 13:23:27 -08:00 committed by gVisor bot
parent 305a456551
commit 5bdc167d17
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.buildkite/hooks/pre-command
View File

@ -4,7 +4,8 @@ PARTITION=$((${PARTITION}+1)) # 1-indexed, but PARALLEL_JOB is 0-indexed.
export TOTAL_PARTITIONS=${BUILDKITE_PARALLEL_JOB_COUNT:-1}
# Ensure Docker has experimental enabled.
if ! grep experimental /etc/docker/daemon.json >/dev/null; then
EXPERIMENTAL=$(sudo docker version --format='{{.Server.Experimental}}')
if test "${EXPERIMENTAL}" != "true"; then
make sudo TARGETS=//runsc:runsc ARGS="install --experimental=true"
sudo systemctl reload docker
sudo systemctl restart docker
fi

4
Makefile
View File

@ -67,11 +67,11 @@ copy: ## Copies the given $(TARGETS) to the given $(DESTINATION). E.g. make copy
.PHONY: copy
run: ## Runs the given $(TARGETS), built with $(OPTIONS), using $(ARGS). E.g. make run TARGETS=runsc ARGS=-version
@$(call build,$(TARGETS) $(ARGS))
@$(call run,$(TARGETS),$(ARGS))
.PHONY: run
sudo: ## Runs the given $(TARGETS) as per run, but using "sudo -E". E.g. make sudo TARGETS=test/root:root_test ARGS=-test.v
@$(call sudo,$(TARGETS) $(ARGS))
@$(call sudo,$(TARGETS),$(ARGS))
.PHONY: sudo
# Load image helpers.