From 89a92c551f4e0bccb187fc1c0a1a18d87e3d676c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 19 Aug 2019 17:00:08 +0200 Subject: [PATCH] makefiles/docker.inc.mk: allow adding docker make arguments Allow defining make arguments when called in docker. It would be the same as adding to `DOCKER_OVERRIDE_CMDLINE` but have a consistent naming. --- makefiles/docker.inc.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index c380b0344f..39c56c8950 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -88,6 +88,9 @@ DOCKER_OVERRIDE_CMDLINE += $(strip $(DOCKER_OVERRIDE_CMDLINE_AUTO)) # Overwrite if you want to use `docker` with sudo DOCKER ?= docker +# 'make' arguments inside docker +DOCKER_MAKE_ARGS += $(DOCKER_MAKECMDGOALS) $(DOCKER_OVERRIDE_CMDLINE) + # Resolve symlink of /etc/localtime to its real path # This is a workaround for docker on macOS, for more information see: # 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_ENVIRONMENT_CMDLINE) \ -w '$(DOCKER_APPDIR)' \ - '$(DOCKER_IMAGE)' make $(DOCKER_MAKECMDGOALS) $(DOCKER_OVERRIDE_CMDLINE) + '$(DOCKER_IMAGE)' make $(DOCKER_MAKE_ARGS)