From 286314994f2be974d05e66d77717a97293e63bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikolai=20G=C3=BCtschow?= Date: Mon, 29 Apr 2024 12:35:44 +0200 Subject: [PATCH] makefiles/docker: prevent recursive docker invocation --- makefiles/docker.inc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index 9012516ea8..60643e3526 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -278,6 +278,10 @@ DOCKER_VOLUMES_AND_ENV += -e 'CCACHE_BASEDIR=$(DOCKER_RIOTBASE)' DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,BUILD_DIR,,build) +# Prevent recursive invocation of docker by explicitely disabling docker via env variable, +# overwriting potential default in application Makefile +DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,BUILD_IN_DOCKER,,0) + DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,RIOTPROJECT,,riotproject) DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,RIOTCPU,,riotcpu) DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,RIOTBOARD,,riotboard)