Merge pull request #6424 from vvoland/update-docker

[28.x] vendor: github.com/docker/docker v28.4.0-dev (249d679a6baf)
vendor: github.com/docker/docker v28.4.0-dev (249d679a6baf)
2026-08-24 10:05:37 -05:00 · 2025-09-03 22:52:20 +02:00 · 2025-09-03 22:32:15 +02:00 · 2025-09-03 21:28:57 +02:00 · 2025-09-03 21:04:36 +02:00 · 2025-09-03 20:58:26 +02:00
13 changed files with 16 additions and 14 deletions
@@ -63,7 +63,7 @@ jobs:
        name: Update Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.24.6"
+          go-version: "1.24.7"
      -
        name: Initialize CodeQL
        uses: github/codeql-action/init@v3
@@ -66,7 +66,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.24.6"
+          go-version: "1.24.7"
      -
        name: Test
        run: |
@@ -5,7 +5,7 @@ run:
  # which causes it to fallback to go1.17 semantics.
  #
  # TODO(thaJeztah): update "usetesting" settings to enable go1.24 features once our minimum version is go1.24
-  go: "1.24.6"
+  go: "1.24.7"

  timeout: 5m

@@ -8,7 +8,7 @@ ARG BASE_VARIANT=alpine
 ARG ALPINE_VERSION=3.21
 ARG BASE_DEBIAN_DISTRO=bookworm

-ARG GO_VERSION=1.24.6
+ARG GO_VERSION=1.24.7
 ARG XX_VERSION=1.6.1
 ARG GOVERSIONINFO_VERSION=v1.4.1

@@ -46,7 +46,9 @@ func newPullCommand(dockerCLI command.Cli) *cobra.Command {
 			"category-top": "5",
 			"aliases":      "docker image pull, docker pull",
 		},
-		ValidArgsFunction: cobra.NoFileCompletions,
+		// Complete with local images to help pulling the latest version
+		// of images that are in the image cache.
+		ValidArgsFunction: completion.ImageNames(dockerCLI, 1),
 	}

 	flags := cmd.Flags()
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.24.6"
+    default = "1.24.7"
 }
 variable "VERSION" {
    default = ""
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.24.6
+ARG GO_VERSION=1.24.7

 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image.
 # It must be a supported tag in the docker.io/library/alpine image repository
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.24.6
+ARG GO_VERSION=1.24.7

 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image.
 # It must be a supported tag in the docker.io/library/alpine image repository
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.24.6
+ARG GO_VERSION=1.24.7

 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image.
 # It must be a supported tag in the docker.io/library/alpine image repository
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.24.6
+ARG GO_VERSION=1.24.7

 FROM golang:${GO_VERSION}-alpine AS generated
 ENV GOTOOLCHAIN=local
@@ -16,7 +16,7 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli-docs-tool v0.10.0
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v28.4.0-rc.1.0.20250902095642-5d5332b00c76+incompatible // 28.x branch (v28.4.0-dev)
+	github.com/docker/docker v28.4.0-rc.2.0.20250903202849-249d679a6baf+incompatible // 28.4.0-dev
 	github.com/docker/docker-credential-helpers v0.9.3
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
@@ -57,8 +57,8 @@ github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09f
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v28.4.0-rc.1.0.20250902095642-5d5332b00c76+incompatible h1:tl2qgu+4b/D7S63nPqQa4234kklUdz8EhAxJ5RPYBlE=
-github.com/docker/docker v28.4.0-rc.1.0.20250902095642-5d5332b00c76+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.4.0-rc.2.0.20250903202849-249d679a6baf+incompatible h1:Pkl6clGEMTFjRD57vOF36IXOeqaURCc7OOz5iAiRY3U=
+github.com/docker/docker v28.4.0-rc.2.0.20250903202849-249d679a6baf+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
 github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
@@ -65,7 +65,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-# github.com/docker/docker v28.4.0-rc.1.0.20250902095642-5d5332b00c76+incompatible
+# github.com/docker/docker v28.4.0-rc.2.0.20250903202849-249d679a6baf+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
Paweł GronowskiandGitHub	d8eb465f86	Merge pull request #6424 from vvoland/update-docker [28.x] vendor: github.com/docker/docker v28.4.0-dev (249d679a6baf)	2025-09-03 22:52:20 +02:00
Paweł Gronowski	a83e3df40b	vendor: github.com/docker/docker v28.4.0-dev (249d679a6baf) full diff: https://github.com/docker/docker/compare/v28.4.0-rc.2...249d679a6baf Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-03 22:32:15 +02:00
Paweł GronowskiandGitHub	ff5ea757b4	Merge pull request #6422 from vvoland/6421-28.x [28.x backport] update to go1.24.7	2025-09-03 21:28:57 +02:00
Paweł GronowskiandGitHub	c1d14aef3c	Merge pull request #6423 from vvoland/update-docker [28.x] vendor: github.com/docker/docker v28.4.0-rc.2	2025-09-03 21:04:36 +02:00
Paweł Gronowski	18adfd54a9	vendor: github.com/docker/docker v28.4.0-rc.2 full diff: https://github.com/docker/docker/compare/5d5332b00c76...v28.4.0-rc.2 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-03 20:58:26 +02:00
Paweł Gronowski	6e20b9d93c	update to go1.24.7 This includes 1 security fix: - net/http: CrossOriginProtection bypass patterns are over-broad When passing patterns to CrossOriginProtection.AddInsecureBypassPattern, requests that would have redirected to those patterns (e.g. without a trailing slash) were also exempted, which might be unexpected. Thanks to Marco Gazerro for reporting this issue. This is CVE-2025-47910 and Go issue https://go.dev/issue/75054. View the release notes for more information: https://go.dev/doc/devel/release#go1.24.7 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `f64b8a332d`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-09-03 20:44:05 +02:00
Sebastiaan van StijnandGitHub	3cadbd82c5	Merge pull request #6420 from thaJeztah/28.x_backport_complete_pull [28.x backport] add completion for docker image pull	2025-09-03 17:35:07 +02:00
Sebastiaan van Stijn	b3df92053d	add completion for docker image pull With this patch, completion is provided for images already present in the local image cache to help pulling the latest version of the same tag; docker pull go<tab> golang:1.12 golang:1.18.0 golang:1.21 golang:1.24 gopher:latest golang:1.13 golang:1.20 golang:1.23 golang:latest docker pull golang:<tab> 1.12 1.13 1.18.0 1.20 1.21 1.23 1.24 latest Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `5bf3c6793d`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-09-03 15:42:07 +02:00