From de0036ff0d43e032805ba18f20121d4259d767ef Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Wed, 24 Apr 2024 17:59:02 +0200 Subject: [PATCH 1/2] build system: pass WIFI_SSID and WIFI_PASS to docker --- makefiles/docker.inc.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index 9012516ea884..4a5fbb93df47 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -70,6 +70,8 @@ export DOCKER_ENV_VARS += \ TOOLCHAIN \ UNDEF \ WERROR \ + WIFI_PASS \ + WIFI_SSID \ # # List of all exported environment variables that shall be passed on to the From 276ad186f2dd94cc4a09a66dfe02f29723f7b480 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Wed, 24 Apr 2024 17:59:28 +0200 Subject: [PATCH 2/2] examples/gnrc_border_router: pass UPLINK etc to docker This allows configuration of the app as described even when using `BUILD_IN_DOCKER=1`. --- examples/gnrc_border_router/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index c52d31ce92bf..f286aa11ee3a 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -123,6 +123,14 @@ endif # the variable to empty SHOULD_RUN_KCONFIG ?= +# Pass through application configuration to the docker container, if +# BUILD_IN_DOCKER=1 is used: +DOCKER_ENV_VARS += IPV6_ADDR +DOCKER_ENV_VARS += IPV6_DEFAULT_ROUTER +DOCKER_ENV_VARS += IPV6_PREFIX IPV6_DEFAULT_ROUTER +DOCKER_ENV_VARS += PREFIX_CONF +DOCKER_ENV_VARS += UPLINK + include $(RIOTBASE)/Makefile.include # Compile-time configuration for DHCPv6 client (needs to come after