From a6b4348492d45f3cff56c555c36d24bd7c1655eb Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Wed, 15 Apr 2026 16:51:31 +0100
Subject: [PATCH] update_sdk_container_image: Don't truncate docker build
 output

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 build_sdk_container_image       | 4 ----
 sdk_lib/sdk_container_common.sh | 5 +++++
 update_sdk_container_image      | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build_sdk_container_image b/build_sdk_container_image
index 7bfa03de07..62146ab9b7 100755
--- a/build_sdk_container_image
+++ b/build_sdk_container_image
@@ -125,10 +125,6 @@ fi
 
 # --
 
-docker_build() {
-    PROGRESS_NO_TRUNC=1 $docker build --progress plain "${@}"
-}
-
 # build plain SDK container w/o board support
 #
 import_image="flatcar-sdk-import:${docker_vernum}"
diff --git a/sdk_lib/sdk_container_common.sh b/sdk_lib/sdk_container_common.sh
index b0f94cfbf6..b98be744af 100644
--- a/sdk_lib/sdk_container_common.sh
+++ b/sdk_lib/sdk_container_common.sh
@@ -41,6 +41,11 @@ docker=${docker_a[*]}
 function call_docker() {
     "${docker_a[@]}" "${@}"
 }
+
+function docker_build() {
+    PROGRESS_NO_TRUNC=1 call_docker build --progress plain "${@}"
+}
+
 # --
 
 # Common "echo" function
diff --git a/update_sdk_container_image b/update_sdk_container_image
index b11f383f57..ab126021e2 100755
--- a/update_sdk_container_image
+++ b/update_sdk_container_image
@@ -75,7 +75,8 @@ fi
 yell "Creating new SDK container image ${new_sdk_version} from ${base_sdk_version}"
 create_versionfile "${new_sdk_version}" "${os_version}"
 
-$docker build -t "${sdk_build_image}" \
+docker_build \
+    -t "${sdk_build_image}" \
     --build-arg BASE="$sdk_container_common_registry/flatcar-sdk-all:${base_sdk_version}" \
     -f sdk_lib/Dockerfile.sdk-update \
     .
@@ -87,7 +88,7 @@ for a in all arm64 amd64; do
         arm64) rmarch="amd64-usr"; rmcross="x86_64-cros-linux-gnu";;
         amd64) rmarch="arm64-usr"; rmcross="aarch64-cros-linux-gnu";;
     esac
-    $docker build -t "$sdk_container_common_registry/flatcar-sdk-${a}:${docker_vernum}" \
+    docker_build -t "$sdk_container_common_registry/flatcar-sdk-${a}:${docker_vernum}" \
                  --build-arg VERSION="${docker_vernum}" \
                  --build-arg RMARCH="${rmarch}" \
                  --build-arg RMCROSS="${rmcross}" \