Merge pull request #50940 from vvoland/50936-23.0

[23.0 backport] Dockerfile.windows: remove deprecated 7Zip4Powershell
Dockerfile.windows: remove deprecated 7Zip4Powershell
2026-01-12 19:21:41 +00:00 · 2025-09-10 11:08:32 +02:00 · 2025-09-09 19:36:23 +02:00 · 2025-09-09 19:34:57 +02:00 · 2025-09-09 17:52:17 +02:00 · 2025-09-09 17:52:15 +02:00
8 changed files with 13 additions and 35 deletions
--- a/.github/workflows/.windows.yml
+++ b/.github/workflows/.windows.yml
@@ -24,7 +24,7 @@ on:
        default: false

 env:
-  GO_VERSION: "1.23.8"
+  GO_VERSION: "1.23.9"
  GOTESTLIST_VERSION: v0.3.1
  TESTSTAT_VERSION: v0.1.3
  WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ on:
  pull_request:

 env:
-  GO_VERSION: "1.23.8"
+  GO_VERSION: "1.23.9"
  GOTESTLIST_VERSION: v0.3.1
  TESTSTAT_VERSION: v0.1.3
  ITG_CLI_MATRIX_SIZE: 6
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.23.8
+ARG GO_VERSION=1.23.9
 ARG BASE_DEBIAN_DISTRO="bookworm"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 ARG XX_VERSION=1.6.1
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.23.8
+ARG GO_VERSION=1.23.9

 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -5,7 +5,7 @@

 # This represents the bare minimum required to build and test Docker.

-ARG GO_VERSION=1.23.8
+ARG GO_VERSION=1.23.9

 ARG BASE_DEBIAN_DISTRO="bookworm"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

-ARG GO_VERSION=1.23.8
+ARG GO_VERSION=1.23.9
 ARG GOTESTSUM_VERSION=v1.8.2
 ARG GOWINRES_VERSION=v0.3.0
 ARG CONTAINERD_VERSION=v1.6.38
@@ -259,14 +259,11 @@ RUN `
  Remove-Item C:\gitsetup.zip; `
  `
  Write-Host INFO: Downloading containerd; `
-  Install-Package -Force 7Zip4PowerShell; `
  $location='https://github.com/containerd/containerd/releases/download/'+$Env:CONTAINERD_VERSION+'/containerd-'+$Env:CONTAINERD_VERSION.TrimStart('v')+'-windows-amd64.tar.gz'; `
  Download-File $location C:\containerd.tar.gz; `
  New-Item -Path C:\containerd -ItemType Directory; `
-  Expand-7Zip C:\containerd.tar.gz C:\; `
-  Expand-7Zip C:\containerd.tar C:\containerd; `
+  tar -xzf C:\containerd.tar.gz -C C:\containerd; `
  Remove-Item C:\containerd.tar.gz; `
-  Remove-Item C:\containerd.tar; `
  `
  # Ensure all directories exist that we will require below....
  $srcDir = """$Env:GOPATH`\src\github.com\docker\docker\bundles"""; `
--- a/contrib/download-frozen-image-v2.sh
+++ b/contrib/download-frozen-image-v2.sh
@@ -59,30 +59,11 @@ fetch_blob() {
 	shift
 	local curlArgs=("$@")

-	local curlHeaders
-	curlHeaders="$(
-		curl -S "${curlArgs[@]}" \
-			-H "Authorization: Bearer $token" \
-			"$registryBase/v2/$image/blobs/$digest" \
-			-o "$targetFile" \
-			-D-
-	)"
-	curlHeaders="$(echo "$curlHeaders" | tr -d '\r')"
-	if grep -qE "^HTTP/[0-9].[0-9] 3" <<< "$curlHeaders"; then
-		rm -f "$targetFile"
-
-		local blobRedirect
-		blobRedirect="$(echo "$curlHeaders" | awk -F ': ' 'tolower($1) == "location" { print $2; exit }')"
-		if [ -z "$blobRedirect" ]; then
-			echo >&2 "error: failed fetching '$image' blob '$digest'"
-			echo "$curlHeaders" | head -1 >&2
-			return 1
-		fi
-
-		curl -fSL "${curlArgs[@]}" \
-			"$blobRedirect" \
-			-o "$targetFile"
-	fi
+	curl -L -S "${curlArgs[@]}" \
+		-H "Authorization: Bearer $token" \
+		"$registryBase/v2/$image/blobs/$digest" \
+		-o "$targetFile" \
+		-D-
 }

 # handle 'application/vnd.docker.distribution.manifest.v2+json' manifest
--- a/vendor.mod
+++ b/vendor.mod
@@ -4,7 +4,7 @@

 module github.com/docker/docker

-go 1.23.8
+go 1.23.9

 require (
 	cloud.google.com/go/compute/metadata v0.2.3
Author	SHA1	Message	Date
Paweł Gronowski	1328a0a61c	Merge pull request #50940 from vvoland/50936-23.0 [23.0 backport] Dockerfile.windows: remove deprecated 7Zip4Powershell	2025-09-10 11:08:32 +02:00
Paweł Gronowski	e7cb7cfc60	Dockerfile.windows: remove deprecated 7Zip4Powershell `tar` utility is included in Windows 10 (17063+) and Windows Server 2019+ so we can use it directly. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `8c8324b37f`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-09 19:36:23 +02:00
Paweł Gronowski	9e8243de60	Merge pull request #50941 from vvoland/50662-23.0 [23.0 backport] Fix download-frozen-image-v2	2025-09-09 19:34:57 +02:00
Paweł Gronowski	9e6bd0772d	download-frozen-image-v2: Use curl -L Passing the Auth to the redirected location was fixed in curl 7.58: https://curl.se/changes.html#7_58_0 so we no longer need the extra handling and can just use `-L` to let curl handle redirects. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `b9b52d59b8`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-09 17:52:17 +02:00
Paweł Gronowski	0fb65cdc92	download-frozen-image-v2: handle 307 responses without decimal Correctly parse HTTP response that doesn't contain an HTTP version with a decimal place: ``` < HTTP/2 307 ``` The previous version would only match strings like `HTTP/2.0 307`. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `359a881cea`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-09 17:52:15 +02:00
Cory Snider	e01bbe8173	Merge pull request #50052 from aepifanov/dev/go1.23.9/23.0 [23.0] Update to go1.23.9	2025-05-22 18:05:49 -04:00
Andrey Epifanov	40b0fcd12f	update to go1.23.9 https://github.com/golang/go/issues?q=milestone%3AGo1.23.9 Signed-off-by: Andrey Epifanov <aepifanov@mirantis.com>	2025-05-22 11:40:09 -07:00