From 6e14e9f3f8ce8717f5fd075c546903edcbd30d75 Mon Sep 17 00:00:00 2001
From: Joseph Ferguson <yosifkit@gmail.com>
Date: Wed, 29 Jul 2026 16:49:47 -0700
Subject: [PATCH] Add back windows checksums

---
 .../windowsservercore-ltsc2022/Dockerfile     |  4 ++--
 .../windowsservercore-ltsc2025/Dockerfile     |  4 ++--
 versions.json                                 | 20 +++++++++++++++++++
 versions.sh                                   |  9 ++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile
index 7089bfc3b..98b236aa0 100644
--- a/29/windows/windowsservercore-ltsc2022/Dockerfile
+++ b/29/windows/windowsservercore-ltsc2022/Dockerfile
@@ -41,8 +41,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
 
 # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414
 ENV DOCKER_BUILDX_VERSION 0.36.0
-ENV DOCKER_BUILDX_URL 
-ENV DOCKER_BUILDX_SHA256 
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \
diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile
index 03627b44f..9e1892056 100644
--- a/29/windows/windowsservercore-ltsc2025/Dockerfile
+++ b/29/windows/windowsservercore-ltsc2025/Dockerfile
@@ -41,8 +41,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
 
 # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414
 ENV DOCKER_BUILDX_VERSION 0.36.0
-ENV DOCKER_BUILDX_URL 
-ENV DOCKER_BUILDX_SHA256 
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \
diff --git a/versions.json b/versions.json
index 96e8d415e..83965dd98 100644
--- a/versions.json
+++ b/versions.json
@@ -41,6 +41,16 @@
           "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b",
           "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64"
         },
+        "darwin-amd64": {
+          "file": "buildx-v0.36.0.darwin-amd64",
+          "sha256": "8a75be22ecf40f633fe0a0199be48fa304c0446a0d7fa8a53d7c71b1d0093028",
+          "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-amd64"
+        },
+        "darwin-arm64v8": {
+          "file": "buildx-v0.36.0.darwin-arm64",
+          "sha256": "82c6a3d9df37790c5bdb0d7ca88986d1d17622fc2b88ebe34b275c6c47acd7a6",
+          "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-arm64"
+        },
         "freebsd-amd64": {
           "file": "buildx-v0.36.0.freebsd-amd64",
           "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d",
@@ -85,6 +95,16 @@
           "file": "buildx-v0.36.0.linux-s390x",
           "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04",
           "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x"
+        },
+        "windows-amd64": {
+          "file": "buildx-v0.36.0.windows-amd64.exe",
+          "sha256": "ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8",
+          "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe"
+        },
+        "windows-arm64v8": {
+          "file": "buildx-v0.36.0.windows-arm64.exe",
+          "sha256": "3c553164f2b25dd6d2314d8a9a2c19afac58d48f49095eeb6b46165d93d114d8",
+          "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-arm64.exe"
         }
       },
       "version": "0.36.0"
diff --git a/versions.sh b/versions.sh
index 0803f1e10..fbbc21134 100755
--- a/versions.sh
+++ b/versions.sh
@@ -63,7 +63,14 @@ buildxVersions="$(
 buildx=
 buildxVersion=
 for buildxVersion in $buildxVersions; do
-	if checksums="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")"; then
+	# checksums.txt -> linux + *bsd checksums
+	# checksums-signed.txt -> windows + darwin checksums (see also https://github.com/docker/buildx/pull/3978)
+	# fail if one is missing
+	if \
+		checksums="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")" \
+		&& checksums+=$'\n' \
+		&& checksums+="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums-signed.txt")" \
+	; then
 		buildx="$(jq <<<"$checksums" -csR --arg version "$buildxVersion" '
 			rtrimstr("\n") | split("\n")
 			| map(