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

makefiles/docker.inc.mk: allow adding docker make arguments

Browse Source 
Allow defining make arguments when called in docker.

It would be the same as adding to `DOCKER_OVERRIDE_CMDLINE` but have a
consistent naming.
This commit is contained in:
Gaëtan Harter 2019-08-19 17:00:08 +02:00
parent 8b90a51524
commit 89a92c551f
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefiles/docker.inc.mk
View File

@ -88,6 +88,9 @@ DOCKER_OVERRIDE_CMDLINE += $(strip $(DOCKER_OVERRIDE_CMDLINE_AUTO))
# Overwrite if you want to use `docker` with sudo # Overwrite if you want to use `docker` with sudo
DOCKER ?= docker DOCKER ?= docker
# 'make' arguments inside docker
DOCKER_MAKE_ARGS += $(DOCKER_MAKECMDGOALS) $(DOCKER_OVERRIDE_CMDLINE)
# Resolve symlink of /etc/localtime to its real path # Resolve symlink of /etc/localtime to its real path
# This is a workaround for docker on macOS, for more information see: # This is a workaround for docker on macOS, for more information see:
# https://github.com/docker/for-mac/issues/2396 # https://github.com/docker/for-mac/issues/2396
@ -272,4 +275,4 @@ DOCKER_VOLUMES_AND_ENV += $(if $(_is_git_worktree),-v $(GIT_WORKTREE_COMMONDIR):
$(DOCKER_VOLUMES_AND_ENV) \ $(DOCKER_VOLUMES_AND_ENV) \
$(DOCKER_ENVIRONMENT_CMDLINE) \ $(DOCKER_ENVIRONMENT_CMDLINE) \
-w '$(DOCKER_APPDIR)' \ -w '$(DOCKER_APPDIR)' \
'$(DOCKER_IMAGE)' make $(DOCKER_MAKECMDGOALS) $(DOCKER_OVERRIDE_CMDLINE) '$(DOCKER_IMAGE)' make $(DOCKER_MAKE_ARGS)