1
0
mirror of https://github.com/docker/cli.git synced 2026-11-01 23:35:23 +03:00

Merge pull request #6832 from vvoland/update-docker

vendor: github.com/moby/moby/api v1.54.0-rc.1 & client v0.2.3-rc.1
This commit is contained in:
Paweł Gronowski
2026-02-27 19:43:43 +00:00
committed by GitHub
7 changed files with 25 additions and 9 deletions

View File

@@ -28,8 +28,8 @@ require (
github.com/google/uuid v1.6.0
github.com/mattn/go-runewidth v0.0.20
github.com/moby/go-archive v0.2.0
github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94
github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94
github.com/moby/moby/api v1.54.0-rc.1
github.com/moby/moby/client v0.2.3-rc.1
github.com/moby/patternmatcher v0.6.0
github.com/moby/swarmkit/v2 v2.1.1
github.com/moby/sys/atomicwriter v0.1.0

View File

@@ -113,10 +113,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8=
github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU=
github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94 h1:32ofGMXE5YyC9W6CRReNtpzUPfzngoHXPSRkai60e7A=
github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94 h1:UnDieHg5LGQYDVEpni5h67HRNvSZMP1FguKrzot3r1o=
github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94/go.mod h1:BLj1NHZAHj53G+DSOsojqE/AbtIFy+ygUNErODq1zbc=
github.com/moby/moby/api v1.54.0-rc.1 h1:y7yOnvjD24qWOof0kAk/wU76Kjmmn/Rfstv2bS2z4vE=
github.com/moby/moby/api v1.54.0-rc.1/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
github.com/moby/moby/client v0.2.3-rc.1 h1:EJU7m5WunbgLw8ufo6TIxiLEpqXvBSzHhjXl9Z1B5jo=
github.com/moby/moby/client v0.2.3-rc.1/go.mod h1:b3+CF2Ln9mr96ROGGjWx8cnVvkVBcOo69OoeIsralw0=
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
github.com/moby/swarmkit/v2 v2.1.1 h1:yvTJ8MMCc3f0qTA44J6R59EZ5yZawdYopkpuLk4+ICU=

View File

@@ -73,6 +73,11 @@ type ImageProperties struct {
// Required: true
Platform ocispec.Platform `json:"Platform"`
// Identity holds information about the identity and origin of the image.
// For image list responses, this can duplicate Build/Pull fields across
// image manifests, because those parts of identity are image-level metadata.
Identity *Identity `json:"Identity,omitempty"`
Size struct {
// Unpacked is the size (in bytes) of the locally unpacked
// (uncompressed) image content that's directly usable by the containers

View File

@@ -107,7 +107,7 @@ const DummyHost = "api.moby.localhost"
// overriding the version and disable API-version negotiation.
//
// This version may be lower than the version of the api library module used.
const MaxAPIVersion = "1.53"
const MaxAPIVersion = "1.54"
// MinAPIVersion is the minimum API version supported by the client. API versions
// below this version are not considered when performing API-version negotiation.

View File

@@ -41,6 +41,14 @@ func (cli *Client) ImageList(ctx context.Context, options ImageListOptions) (Ima
query.Set("manifests", "1")
}
}
if options.Identity {
if err := cli.requiresVersion(ctx, "1.54", "identity"); err != nil {
return ImageListResult{}, err
}
// Identity data in image list is scoped to manifests.
query.Set("manifests", "1")
query.Set("identity", "1")
}
resp, err := cli.get(ctx, "/images/json", query, nil)
defer ensureReaderClosed(resp)

View File

@@ -16,6 +16,9 @@ type ImageListOptions struct {
// Manifests indicates whether the image manifests should be returned.
Manifests bool
// Identity indicates whether image identity information should be returned.
Identity bool
}
// ImageListResult holds the result from ImageList.

4
vendor/modules.txt vendored
View File

@@ -167,7 +167,7 @@ github.com/moby/docker-image-spec/specs-go/v1
github.com/moby/go-archive
github.com/moby/go-archive/compression
github.com/moby/go-archive/tarheader
# github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94
# github.com/moby/moby/api v1.54.0-rc.1
## explicit; go 1.24.0
github.com/moby/moby/api/pkg/authconfig
github.com/moby/moby/api/pkg/stdcopy
@@ -189,7 +189,7 @@ github.com/moby/moby/api/types/storage
github.com/moby/moby/api/types/swarm
github.com/moby/moby/api/types/system
github.com/moby/moby/api/types/volume
# github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94
# github.com/moby/moby/client v0.2.3-rc.1
## explicit; go 1.24.0
github.com/moby/moby/client
github.com/moby/moby/client/internal