riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

makefiles/docker.inc.mk: add DOCKER_RIOTBASE variable

Browse Source 
It represents the path of RIOTBASE inside the docker container.
This commit is contained in:
cladmi 2018-09-04 14:51:02 +02:00 committed by Gaëtan Harter
parent 16e4722670
commit a0f25ed47b
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefiles/docker.inc.mk
View File

@ -1,5 +1,6 @@
export DOCKER_IMAGE ?= riot/riotbuild:latest export DOCKER_IMAGE ?= riot/riotbuild:latest
export DOCKER_BUILD_ROOT ?= /data/riotbuild export DOCKER_BUILD_ROOT ?= /data/riotbuild
DOCKER_RIOTBASE ?= $(DOCKER_BUILD_ROOT)/riotbase
export DOCKER_FLAGS ?= --rm export DOCKER_FLAGS ?= --rm
# List of Docker-enabled make goals # List of Docker-enabled make goals
export DOCKER_MAKECMDGOALS_POSSIBLE = \ export DOCKER_MAKECMDGOALS_POSSIBLE = \
@ -111,14 +112,14 @@ ETC_LOCALTIME = $(realpath /etc/localtime)
@# HACK: Handle directory creation here until it is provided globally @# HACK: Handle directory creation here until it is provided globally
$(Q)mkdir -p $(BUILD_DIR) $(Q)mkdir -p $(BUILD_DIR)
$(DOCKER) run $(DOCKER_FLAGS) -t -u "$$(id -u)" \ $(DOCKER) run $(DOCKER_FLAGS) -t -u "$$(id -u)" \
-v '$(RIOTBASE):$(DOCKER_BUILD_ROOT)/riotbase' \ -v '$(RIOTBASE):$(DOCKER_RIOTBASE)' \
-v '$(BUILD_DIR):$(DOCKER_BUILD_ROOT)/build' \ -v '$(BUILD_DIR):$(DOCKER_BUILD_ROOT)/build' \
-v '$(RIOTCPU):$(DOCKER_BUILD_ROOT)/riotcpu' \ -v '$(RIOTCPU):$(DOCKER_BUILD_ROOT)/riotcpu' \
-v '$(RIOTBOARD):$(DOCKER_BUILD_ROOT)/riotboard' \ -v '$(RIOTBOARD):$(DOCKER_BUILD_ROOT)/riotboard' \
-v '$(RIOTMAKE):$(DOCKER_BUILD_ROOT)/riotmake' \ -v '$(RIOTMAKE):$(DOCKER_BUILD_ROOT)/riotmake' \
-v '$(RIOTPROJECT):$(DOCKER_BUILD_ROOT)/riotproject' \ -v '$(RIOTPROJECT):$(DOCKER_BUILD_ROOT)/riotproject' \
-v '$(ETC_LOCALTIME):/etc/localtime:ro' \ -v '$(ETC_LOCALTIME):/etc/localtime:ro' \
-e 'RIOTBASE=$(DOCKER_BUILD_ROOT)/riotbase' \ -e 'RIOTBASE=$(DOCKER_RIOTBASE)' \
-e 'BUILD_DIR=$(DOCKER_BUILD_ROOT)/build' \ -e 'BUILD_DIR=$(DOCKER_BUILD_ROOT)/build' \
-e 'CCACHE_BASEDIR=$(DOCKER_BUILD_ROOT)/riotbase' \ -e 'CCACHE_BASEDIR=$(DOCKER_BUILD_ROOT)/riotbase' \
-e 'RIOTCPU=$(DOCKER_BUILD_ROOT)/riotcpu' \ -e 'RIOTCPU=$(DOCKER_BUILD_ROOT)/riotcpu' \