From 147ad7e9686f01adb42646347e6ebc2e5f1f0515 Mon Sep 17 00:00:00 2001
From: Jonathan Beri <jmberi@gmail.com>
Date: Sun, 15 Mar 2026 06:49:53 -0700
Subject: [PATCH] docker: fix ARG scoping, remove cache-defeating cleanup,
 quiet tar

---
 zephyr-base/Dockerfile  | 6 ++----
 zephyr-posix/Dockerfile | 7 +++----
 zephyr/Dockerfile       | 9 ++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/zephyr-base/Dockerfile b/zephyr-base/Dockerfile
index 4722acd..2a5b659 100644
--- a/zephyr-base/Dockerfile
+++ b/zephyr-base/Dockerfile
@@ -38,12 +38,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   xz-utils \
   && wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${sdk_file_name}" \
   && mkdir -p ${ZEPHYR_SDK_INSTALL_DIR} \
-  && tar -xvf ${sdk_file_name} -C ${ZEPHYR_SDK_INSTALL_DIR} --strip-components=1 \
+  && tar -xf ${sdk_file_name} -C ${ZEPHYR_SDK_INSTALL_DIR} --strip-components=1 \
   && ${ZEPHYR_SDK_INSTALL_DIR}/setup.sh -c \
   && rm ${sdk_file_name} \
   && apt-get remove -y --purge \
   wget \
   xz-utils \
-  && apt-get autoremove -y \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
+  && apt-get autoremove -y
\ No newline at end of file
diff --git a/zephyr-posix/Dockerfile b/zephyr-posix/Dockerfile
index d9eeecc..04abd86 100644
--- a/zephyr-posix/Dockerfile
+++ b/zephyr-posix/Dockerfile
@@ -7,7 +7,8 @@ FROM ${BASE_IMAGE}
 
 # OS dependencies and Zephyr SDK posix setup
 
-ARG ZEPHYR_SDK_INSTALL_DIR
+ARG ZEPHYR_SDK_VERSION=1.0.0
+ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -19,6 +20,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && ${ZEPHYR_SDK_INSTALL_DIR}/setup.sh -c \
   && apt-get remove -y --purge \
   wget \
-  && apt-get autoremove -y \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
+  && apt-get autoremove -y
\ No newline at end of file
diff --git a/zephyr/Dockerfile b/zephyr/Dockerfile
index 7c29403..315dd18 100644
--- a/zephyr/Dockerfile
+++ b/zephyr/Dockerfile
@@ -8,8 +8,9 @@ FROM ${BASE_IMAGE}
 
 # Target architecture SDK
 
-ARG ZEPHYR_SDK_INSTALL_DIR
-ARG ZEPHYR_SDK_TOOLCHAINS
+ARG ZEPHYR_SDK_VERSION=1.0.0
+ARG ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION}
+ARG ZEPHYR_SDK_TOOLCHAINS="-t arm-zephyr-eabi"
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -21,6 +22,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && apt-get remove -y --purge \
   wget \
   xz-utils \
-  && apt-get autoremove -y \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+  && apt-get autoremove -y