Skip to content

Commit 42283c4

Browse files
authored
Merge pull request #21901 from maribu/docker/don-t-leave-1-dirs
build-system: do not create empty folders named `1`
2 parents a23948c + 193aa54 commit 42283c4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

makefiles/docker.inc.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export DOCKER_ENV_VARS += \
9999
# List of all exported environment variables that shall be passed on to the
100100
# Docker container since they might have been set through the command line
101101
# and environment.
102-
# Their origin cannot be checked since they are often redefined or overriden
102+
# Their origin cannot be checked since they are often redefined or overridden
103103
# in Makefile/Makefile.include, etc. and their origin is changed to file
104104
export DOCKER_ENV_VARS_ALWAYS += \
105105
DISABLE_MODULE \
@@ -191,7 +191,7 @@ DOCKER_MAKE_ARGS += $(DOCKER_MAKE_JOBS)
191191
# the variable is mapped to a path inside `DOCKER_RIOTBASE` in the container.
192192
#
193193
# * if the directory is not contained in the `RIOT` repository,
194-
# the directory must be mounted in the countainer.
194+
# the directory must be mounted in the container.
195195
# The variable and directory are mapped to a path outside `DOCKER_RIOTBASE`.
196196
# Some variables have hardwritten mapping directories (`RIOTCPU` for example),
197197
# and other have a mapping directory based on their directory name.
@@ -214,7 +214,7 @@ define dir_is_outside_riotbase
214214
$(filter $(abspath $1)/,$(patsubst $(RIOTBASE)/%,%,$(abspath $1)/))
215215
endef
216216

217-
# Mapping of directores inside docker
217+
# Mapping of directories inside docker
218218
#
219219
# Return the path of directories from the host within the container
220220
#
@@ -302,9 +302,9 @@ DOCKER_VOLUMES_AND_ENV += -e 'CCACHE_BASEDIR=$(DOCKER_RIOTBASE)'
302302

303303
DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,BUILD_DIR,,build)
304304

305-
# Prevent recursive invocation of docker by explicitely disabling docker via env variable,
305+
# Prevent recursive invocation of docker by explicitly disabling docker via env variable,
306306
# overwriting potential default in application Makefile
307-
DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,BUILD_IN_DOCKER,,0)
307+
DOCKER_VOLUMES_AND_ENV += -e 'BUILD_IN_DOCKER=0'
308308

309309
DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,RIOTPROJECT,,riotproject)
310310
DOCKER_VOLUMES_AND_ENV += $(call docker_volume_and_env,RIOTCPU,,riotcpu)

0 commit comments

Comments
 (0)