From e6bc0a25f8fafb69671d04c1666d7d3d51fa84ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Wed, 7 Oct 2026 21:28:18 +0200
Subject: [PATCH] pkg: Use docker-cli and docker-engine dirs inside static
 archives
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The standalone static archives were renamed in
a270e34d3eb117f3277b65578a1bd0ae4c160c17 to docker-cli and
docker-engine, but their top-level directory still came from PKG_NAME.
Extracting them produced docker-ce-cli/ and docker-ce/ directories.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 pkg/docker-cli/scripts/pkg-static-build.sh    | 16 +++++++++-------
 pkg/docker-engine/scripts/pkg-static-build.sh | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkg/docker-cli/scripts/pkg-static-build.sh b/pkg/docker-cli/scripts/pkg-static-build.sh
index 0862402e..0a2b1057 100755
--- a/pkg/docker-cli/scripts/pkg-static-build.sh
+++ b/pkg/docker-cli/scripts/pkg-static-build.sh
@@ -74,27 +74,29 @@ if [ -n "$(xx-info variant)" ]; then
 fi
 mkdir -p "${pkgoutput}"
 
+dirname="docker-cli"
+
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}"
+  mkdir -p "$workdir/${dirname}"
   (
     set -x
-    cp -L "${pkgname}/docker" "$workdir/${pkgname}/${clibin}"
-    cp ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
+    cp -L "${pkgname}/docker" "$workdir/${dirname}/${clibin}"
+    cp ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${dirname}/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
-    pkgfile="${pkgoutput}/docker-cli_${GENVER_VERSION#v}.zip"
+    pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" "${dirname}"
     )
   else
-    pkgfile="${pkgoutput}/docker-cli_${GENVER_VERSION#v}.tgz"
+    pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" "${dirname}"
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/docker-engine/scripts/pkg-static-build.sh b/pkg/docker-engine/scripts/pkg-static-build.sh
index eb8f9a11..be1e588e 100755
--- a/pkg/docker-engine/scripts/pkg-static-build.sh
+++ b/pkg/docker-engine/scripts/pkg-static-build.sh
@@ -89,26 +89,28 @@ if [ -n "$(xx-info variant)" ]; then
 fi
 mkdir -p "${pkgoutput}"
 
+dirname="docker-engine"
+
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}"
+  mkdir -p "$workdir/${dirname}"
   (
     set -x
-    cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
+    cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${dirname}/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
-    pkgfile="${pkgoutput}/docker-engine_${GENVER_VERSION#v}.zip"
+    pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" "${dirname}"
     )
   else
-    pkgfile="${pkgoutput}/docker-engine_${GENVER_VERSION#v}.tgz"
+    pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" "${dirname}"
     )
   fi
   write-sha256sum "$pkgfile"