From bbf68812bc7984d670569b72ea9ef2055cc101f6 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Mon, 17 May 2021 12:44:23 +0300 Subject: [PATCH] build: Add option to use rootless containers. --- build/makefile_base.mak | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 7afaba31..bc7b7923 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -55,8 +55,12 @@ else DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) endif -DOCKER_BASE = docker run --rm -e HOME -e USER -e USERID=$(shell id -u) -u $(shell id -u):$(shell id -g) \ - -v $(SRC):$(SRC) -v $(OBJ):$(OBJ) -w $(OBJ) -e MAKEFLAGS \ +ifneq ($(ROOTLESS_CONTAINER),1) + DOCKER_OPTS := -e HOME -e USER -e USERID=$(shell id -u) -u $(shell id -u):$(shell id -g) $(DOCKER_OPTS) +endif + +DOCKER_BASE = docker run --rm -v $(SRC):$(SRC) -v $(OBJ):$(OBJ) \ + -w $(OBJ) -e MAKEFLAGS \ $(DOCKER_OPTS) $(STEAMRT_IMAGE) STEAMRT_NAME ?= soldier