From 923760201480ee8daf2e7a07baa6d257046332ea Mon Sep 17 00:00:00 2001
From: Markus Becker <markus.becker@tridonic.com>
Date: Mon, 2 Dec 2024 13:08:20 +0100
Subject: [PATCH 1/2] Include the full SDK in the Docker image

---
 ncs/Dockerfile | 18 ++++++++++++++++++
 ncs/entry.sh   |  3 +++
 2 files changed, 21 insertions(+)
 create mode 100644 ncs/entry.sh

diff --git a/ncs/Dockerfile b/ncs/Dockerfile
index 873784e..0151c38 100644
--- a/ncs/Dockerfile
+++ b/ncs/Dockerfile
@@ -27,3 +27,21 @@ RUN \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && rm -rf ncs/downloads
+
+WORKDIR /workdir
+
+# Prepare image with a ready to use build environment
+SHELL ["nrfutil","toolchain-manager","launch","/bin/bash","--","-c"]
+RUN <<EOT
+    west init -m https://github.com/nrfconnect/sdk-nrf --mr ${NCS_SDK_VERSION} .
+    if [[ $NCS_VERSION =~ "^[a-fA-F0-9]{32}$" ]]; then
+        git checkout ${NCS_SDK_VERSION};
+    fi
+    west update --narrow -o=--depth=1
+EOT
+
+# Launch into build environment with the passed arguments
+# Currently this is not supported in GitHub Actions
+# See https://github.com/actions/runner/issues/1964
+ENTRYPOINT [ "nrfutil", "toolchain-manager", "launch", "/bin/bash", "--", "/root/entry.sh" ]
+COPY ./entry.sh /root/entry.sh
diff --git a/ncs/entry.sh b/ncs/entry.sh
new file mode 100644
index 0000000..1b565af
--- /dev/null
+++ b/ncs/entry.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $@

From de1d42b9cba35ff2dfef1731913fc27f1b67a4c2 Mon Sep 17 00:00:00 2001
From: Markus Becker <markus.becker@tridonic.com>
Date: Mon, 2 Dec 2024 13:18:27 +0100
Subject: [PATCH 2/2] entry.sh is in ncs/

---
 ncs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ncs/Dockerfile b/ncs/Dockerfile
index 0151c38..53640ff 100644
--- a/ncs/Dockerfile
+++ b/ncs/Dockerfile
@@ -44,4 +44,4 @@ EOT
 # Currently this is not supported in GitHub Actions
 # See https://github.com/actions/runner/issues/1964
 ENTRYPOINT [ "nrfutil", "toolchain-manager", "launch", "/bin/bash", "--", "/root/entry.sh" ]
-COPY ./entry.sh /root/entry.sh
+COPY ./ncs/entry.sh /root/entry.sh