From a5b235ac1d99d547c33304c3ca59d58189c30aa2 Mon Sep 17 00:00:00 2001
From: Jeffrey van Pelt <jeff@vanpelt.one>
Date: Tue, 17 Mar 2026 15:26:37 +0100
Subject: [PATCH 1/4] Improve buildscript to allow for custom selection of
 apps/watchfaces

---
 docker/build.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker/build.sh b/docker/build.sh
index b7637f4990..bbc4d21af5 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -77,6 +77,18 @@ GetNrfSdk() {
 }
 
 CmakeGenerate() {
+  CMAKE_ARGS=''
+
+  if [ -n "$ENABLE_USERAPPS" ]
+  then
+    CMAKE_ARGS=-DENABLE_USERAPPS=$ENABLE_USERAPPS
+  fi
+
+  if [ -n "$ENABLE_WATCHFACES" ]
+  then
+    CMAKE_ARGS=${CMAKE_ARGS} -DENABLE_WATCHFACES=$ENABLE_WATCHFACES
+  fi
+
   cmake -G "Unix Makefiles" \
     -S "$SOURCES_DIR" \
     -B "$BUILD_DIR" \
@@ -84,7 +96,8 @@ CmakeGenerate() {
     -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \
     -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
     -DBUILD_DFU=1 \
-    -DBUILD_RESOURCES=1
+    -DBUILD_RESOURCES=1 \
+    $CMAKE_ARGS
 }
 
 CmakeBuild() {

From fd32e89670dd70b3bcd9e3abd070989ee74bc26a Mon Sep 17 00:00:00 2001
From: Jeffrey van Pelt <jeff@vanpelt.one>
Date: Tue, 17 Mar 2026 15:29:40 +0100
Subject: [PATCH 2/4] Added docs

---
 doc/buildWithDocker.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/buildWithDocker.md b/doc/buildWithDocker.md
index db9bfcfc98..513df83136 100644
--- a/doc/buildWithDocker.md
+++ b/doc/buildWithDocker.md
@@ -87,3 +87,9 @@ Here's an example for `pinetime-app`:
 ```sh
 docker run --rm -it -v ${PWD}:/sources --user $(id -u):$(id -g) infinitime-build /opt/build.sh pinetime-app
 ```
+
+If you want to change the apps and/or watchfaces built in the project, you can pass `ENABLE_USERAPPS` and `ENABLE_WATCHFACES` as environment variables like so:
+
+```sh
+docker run --rm -it -v ${PWD}:/sources -e ENABLE_USERAPPS="Apps::Alarm,Apps::Timer,Apps::Steps,Apps::HeartRate,Apps::Music,Apps::Navigation" infinitime-build
+```

From 23412a355ab7a941d1295386a491cad590d2b2e2 Mon Sep 17 00:00:00 2001
From: Jeffrey van Pelt <jeff@vanpelt.one>
Date: Tue, 17 Mar 2026 19:44:13 +0100
Subject: [PATCH 3/4] Fix quoting

---
 docker/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/build.sh b/docker/build.sh
index bbc4d21af5..b08bca81dc 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -81,12 +81,12 @@ CmakeGenerate() {
 
   if [ -n "$ENABLE_USERAPPS" ]
   then
-    CMAKE_ARGS=-DENABLE_USERAPPS=$ENABLE_USERAPPS
+    CMAKE_ARGS="-DENABLE_USERAPPS=$ENABLE_USERAPPS"
   fi
 
   if [ -n "$ENABLE_WATCHFACES" ]
   then
-    CMAKE_ARGS=${CMAKE_ARGS} -DENABLE_WATCHFACES=$ENABLE_WATCHFACES
+    CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_WATCHFACES=$ENABLE_WATCHFACES"
   fi
 
   cmake -G "Unix Makefiles" \

From 16054d6e886c2b3c859b0824d84aa7412bb481dc Mon Sep 17 00:00:00 2001
From: Jeffrey van Pelt <jeff@vanpelt.one>
Date: Tue, 17 Mar 2026 20:10:49 +0100
Subject: [PATCH 4/4] Reworked into bash array to prevent issues when setting
 watchfaces :-)

---
 docker/build.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/docker/build.sh b/docker/build.sh
index b08bca81dc..04963ea0ab 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -77,17 +77,9 @@ GetNrfSdk() {
 }
 
 CmakeGenerate() {
-  CMAKE_ARGS=''
-
-  if [ -n "$ENABLE_USERAPPS" ]
-  then
-    CMAKE_ARGS="-DENABLE_USERAPPS=$ENABLE_USERAPPS"
-  fi
-
-  if [ -n "$ENABLE_WATCHFACES" ]
-  then
-    CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_WATCHFACES=$ENABLE_WATCHFACES"
-  fi
+  CMAKE_ARGS=()
+  [ -n "$ENABLE_USERAPPS" ]  && CMAKE_ARGS+=("-DENABLE_USERAPPS=$ENABLE_USERAPPS")
+  [ -n "$ENABLE_WATCHFACES" ] && CMAKE_ARGS+=("-DENABLE_WATCHFACES=$ENABLE_WATCHFACES")
 
   cmake -G "Unix Makefiles" \
     -S "$SOURCES_DIR" \
@@ -97,7 +89,7 @@ CmakeGenerate() {
     -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
     -DBUILD_DFU=1 \
     -DBUILD_RESOURCES=1 \
-    $CMAKE_ARGS
+    ${CMAKE_ARGS[@]}
 }
 
 CmakeBuild() {