Skip to content

Commit

Permalink
makefiles/docker: prevent recursive docker invocation
Browse files Browse the repository at this point in the history
  • Loading branch information
mguetschow committed Apr 29, 2024
1 parent 39c231f commit 2863149
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions makefiles/docker.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2863149

Please sign in to comment.