From cd1c7882d95ba2f498a3896687083c5201b551e1 Mon Sep 17 00:00:00 2001
From: Sergey <61871201+SergeyLadanov@users.noreply.github.com>
Date: Sun, 17 Sep 2023 21:03:31 +0300
Subject: [PATCH 1/5] Update entrypoint.sh

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 689dcdb..913fd06 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,7 +9,7 @@
 #. ~/.bashrc
 
 . /root/gn/zephyr/zephyr-env.sh
-/bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -t all
+/bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -t arm-zephyr-eabi
 /bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -h
 /bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -c
 

From 6df2e64feaed65a4df3ce58d67a27083ca038ca6 Mon Sep 17 00:00:00 2001
From: Sergey <61871201+SergeyLadanov@users.noreply.github.com>
Date: Sun, 17 Sep 2023 21:17:19 +0300
Subject: [PATCH 2/5] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 768c857..2e6653a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,8 @@ RUN ARCH="$(dpkg --print-architecture)" && \
     rm zephyr-sdk-${ZEPHYR_TAG}_linux-$ZEPHYR_ARCH.tar.${ZEPHYR_ARCHIVE_EXTENSION} && \
     apt-get remove python3-pip build-essential -y && \
     apt autoremove -y && \
-    apt autoclean -y
+    apt autoclean -y && \
+    find ./zephyr-sdk-${ZEPHYR_TAG} -maxdepth 1 -not -name 'zephyr-sdk-${ZEPHYR_TAG}' -not -name 'arm-zephyr-eabi' -not -name 'cmake' -not -name 'sdk_*' -not -name '*.sh' -exec rm -R {} \;
 
 COPY ./entrypoint.sh /bin/
 

From 202d045accf568832f56699637e0c2562d0a35b1 Mon Sep 17 00:00:00 2001
From: Sergey <61871201+SergeyLadanov@users.noreply.github.com>
Date: Sun, 17 Sep 2023 21:20:42 +0300
Subject: [PATCH 3/5] Update entrypoint.sh

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 913fd06..4928574 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,7 +10,7 @@
 
 . /root/gn/zephyr/zephyr-env.sh
 /bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -t arm-zephyr-eabi
-/bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -h
+#/bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -h
 /bin/bash /root/zephyr-sdk-${ZEPHYR_TAG}/setup.sh -c
 
 $@

From 9cebfba5c79b878d4c5917f3a1363971105a92c3 Mon Sep 17 00:00:00 2001
From: Sergey <61871201+SergeyLadanov@users.noreply.github.com>
Date: Sun, 17 Sep 2023 21:37:29 +0300
Subject: [PATCH 4/5] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 2e6653a..6b57fa3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,7 +70,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \
     apt-get remove python3-pip build-essential -y && \
     apt autoremove -y && \
     apt autoclean -y && \
-    find ./zephyr-sdk-${ZEPHYR_TAG} -maxdepth 1 -not -name 'zephyr-sdk-${ZEPHYR_TAG}' -not -name 'arm-zephyr-eabi' -not -name 'cmake' -not -name 'sdk_*' -not -name '*.sh' -exec rm -R {} \;
+    find ./zephyr-sdk-${ZEPHYR_TAG} -maxdepth 1 -not -name zephyr-sdk-${ZEPHYR_TAG} -not -name 'arm-zephyr-eabi' -not -name 'cmake' -not -name 'sdk_*' -not -name '*.sh' -exec rm -R {} \;
 
 COPY ./entrypoint.sh /bin/
 

From e12cb0021be080eb7344ae9b92574c941fee45af Mon Sep 17 00:00:00 2001
From: Sergey Ladanov <sergei_ladanov_93@mail.ru>
Date: Sun, 17 Sep 2023 22:10:16 +0300
Subject: [PATCH 5/5] update

---
 Dockerfile         | 7 +++++--
 docker-compose.yml | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b57fa3..3371f3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,13 @@ FROM debian:stable-slim
 
 #ARG ARCH=amd64
 ARG NRF_CONNECT_TAG=v2.3.0
+# Should be for selected NRF_CONNECT_TAG
+ARG ZEPHYR_NEEDED_TAG=0.15.2
 # For new versions - xz
 ARG ZEPHYR_ARCHIVE_EXTENSION=gz
-# Should be for selected NRF_CONNECT_TAG
-ENV ZEPHYR_TAG=0.15.2
+
+# For entrypoint file
+ENV ZEPHYR_TAG=$ZEPHYR_NEEDED_TAG
 
 RUN ARCH="$(dpkg --print-architecture)" && \
     case $ARCH in \
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d2a36b..7e79ce0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,5 +7,6 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        - NRF_CONNECT_TAG=v2.4.2
-        - ZEPHYR_TAG=0.16.1
+        - NRF_CONNECT_TAG=v2.3.0
+        - ZEPHYR_NEEDED_TAG=0.15.2
+        - ZEPHYR_ARCHIVE_EXTENSION=gz