netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: Don't overwrite RUNTIME-related variables if they are already set.

Browse Source 
Without this, setting `RUNTIME` in the environment has no effect.

PiperOrigin-RevId: 459311928
This commit is contained in:
Etienne Perot
2022-07-06 12:15:06 -07:00
committed by gVisor bot
parent 5b70da9525
commit 1b60c51687
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -105,14 +105,14 @@ endif
## DOCKER_RELOAD_COMMAND - The command to run to reload Docker. (default: sudo systemctl reload docker).
ifeq (,$(BRANCH_NAME))
RUNTIME := runsc
RUNTIME ?= runsc
else
RUNTIME := $(BRANCH_NAME)
RUNTIME ?= $(BRANCH_NAME)
endif
RUNTIME_DIR ?= $(shell dirname $(shell mktemp -u))/$(RUNTIME)
RUNTIME_BIN := $(RUNTIME_DIR)/runsc
RUNTIME_LOG_DIR := $(RUNTIME_DIR)/logs
RUNTIME_LOGS := $(RUNTIME_LOG_DIR)/runsc.log.%TEST%.%TIMESTAMP%.%COMMAND%
RUNTIME_BIN ?= $(RUNTIME_DIR)/runsc
RUNTIME_LOG_DIR ?= $(RUNTIME_DIR)/logs
RUNTIME_LOGS ?= $(RUNTIME_LOG_DIR)/runsc.log.%TEST%.%TIMESTAMP%.%COMMAND%
RUNTIME_ARGS ?=
DOCKER_RELOAD_COMMAND ?= sudo systemctl reload docker