From 1d854ad09eef66259b8277aca9b2b8c4388bbf16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 4 Apr 2024 14:29:32 +0200 Subject: [PATCH] vendor: github.com/docker/docker PR #47526 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- vendor.mod | 2 + vendor.sum | 4 +- vendor/github.com/docker/docker/AUTHORS | 9 +++ .../github.com/docker/docker/api/swagger.yaml | 57 +++++++++++++++++++ .../docker/api/types/image/platform_image.go | 43 ++++++++++++++ .../docker/docker/api/types/image/summary.go | 9 +++ vendor/modules.txt | 3 +- 7 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 vendor/github.com/docker/docker/api/types/image/platform_image.go diff --git a/vendor.mod b/vendor.mod index d17680cc33b1..e90b4f9483ce 100644 --- a/vendor.mod +++ b/vendor.mod @@ -54,6 +54,8 @@ require ( tags.cncf.io/container-device-interface v0.6.2 ) +replace github.com/docker/docker => github.com/vvoland/moby v20.10.3-0.20240404141845-f7c6a8316acc+incompatible + require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/vendor.sum b/vendor.sum index 48e6aa68cd92..b26c5cb761b4 100644 --- a/vendor.sum +++ b/vendor.sum @@ -57,8 +57,6 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5 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 v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU= -github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= @@ -278,6 +276,8 @@ github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a h1:tlJ github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a/go.mod h1:Y94A6rPp2OwNfP/7vmf8O2xx2IykP8pPXQ1DLouGnEw= github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d h1:wvQZpqy8p0D/FUia6ipKDhXrzPzBVJE4PZyPc5+5Ay0= github.com/tonistiigi/go-rosetta v0.0.0-20200727161949-f79598599c5d/go.mod h1:xKQhd7snlzKFuUi1taTGWjpRE8iFTA06DeacYi3CVFQ= +github.com/vvoland/moby v20.10.3-0.20240404141845-f7c6a8316acc+incompatible h1:+A/A+kuIM8TRxjxFzv9+fjuRAYSFuxD5MPBXPuJmC1A= +github.com/vvoland/moby v20.10.3-0.20240404141845-f7c6a8316acc+incompatible/go.mod h1:nLN96xVmxZq8CPEl0UgxMpO/G2e8MQtjhAdlRDUdBi0= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b h1:FsyNrX12e5BkplJq7wKOLk0+C6LZ+KGXvuEcKUYm5ss= github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/vendor/github.com/docker/docker/AUTHORS b/vendor/github.com/docker/docker/AUTHORS index 48d04f9a983f..36315d429d1e 100644 --- a/vendor/github.com/docker/docker/AUTHORS +++ b/vendor/github.com/docker/docker/AUTHORS @@ -669,6 +669,7 @@ Erik Hollensbe Erik Inge Bolsø Erik Kristensen Erik Sipsma +Erik Sjölund Erik St. Martin Erik Weathers Erno Hopearuoho @@ -731,6 +732,7 @@ Feroz Salam Ferran Rodenas Filipe Brandenburger Filipe Oliveira +Filipe Pina Flavio Castelli Flavio Crisciani Florian @@ -875,6 +877,8 @@ Hsing-Yu (David) Chen hsinko <21551195@zju.edu.cn> Hu Keping Hu Tao +Huajin Tong +huang-jl <1046678590@qq.com> HuanHuan Ye Huanzhong Zhang Huayi Zhang @@ -969,6 +973,7 @@ Jannick Fahlbusch Januar Wayong Jared Biel Jared Hocutt +Jaroslav Jindrak Jaroslaw Zabiello Jasmine Hegman Jason A. Donenfeld @@ -1012,6 +1017,7 @@ Jeffrey Bolle Jeffrey Morgan Jeffrey van Gogh Jenny Gebske +Jeongseok Kang Jeremy Chambers Jeremy Grosser Jeremy Huntwork @@ -1029,6 +1035,7 @@ Jezeniel Zapanta Jhon Honce Ji.Zhilong Jian Liao +Jian Zeng Jian Zhang Jiang Jinyang Jianyong Wu @@ -1967,6 +1974,7 @@ Sergey Evstifeev Sergii Kabashniuk Sergio Lopez Serhat Gülçiçek +Serhii Nakon SeungUkLee Sevki Hasirci Shane Canon @@ -2253,6 +2261,7 @@ VladimirAus Vladislav Kolesnikov Vlastimil Zeman Vojtech Vitek (V-Teq) +voloder <110066198+voloder@users.noreply.github.com> Walter Leibbrandt Walter Stanish Wang Chao diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml index 5677340dbd53..24acdd9483d3 100644 --- a/vendor/github.com/docker/docker/api/swagger.yaml +++ b/vendor/github.com/docker/docker/api/swagger.yaml @@ -1988,6 +1988,19 @@ definitions: x-nullable: false type: "integer" example: 2 + PlatformImages: + description: | + Platform-specific images available for this image. + + Only present with the containerd integration enabled. + + WARNING: This is experimental and may change at any time without any backward + compatibility. + type: "array" + x-nullable: false + x-omitempty: true + items: + $ref: "#/definitions/PlatformImage" AuthConfig: type: "object" @@ -6200,6 +6213,50 @@ definitions: additionalProperties: type: "string" + PlatformImage: + x-nullable: false + required: [Id, Descriptor, Available, Platform, ContentSize, UnpackedSize, Containers] + description: | + PlatformImage represents a platform-specific image that is part of a + multi-platform image. + type: "object" + properties: + Id: + description: | + Content-addressable ID of an image derived from the platform-specific + image manifest. + type: "string" + example: "sha256:95869fbcf224d947ace8d61d0e931d49e31bb7fc67fffbbe9c3198c33aa8e93f" + Descriptor: + $ref: "#/definitions/OCIDescriptor" + Available: + description: Indicates whether the image is locally available. + type: "boolean" + example: true + Platform: + $ref: "#/definitions/OCIPlatform" + ContentSize: + description: | + The size of the available distributable (possibly compressed) image content + in bytes. + type: "integer" + format: "int64" + example: 3987495 + UnpackedSize: + description: | + The size of the unpacked and uncompressed image content (needed for + the image to be useable by containers) in bytes. + type: "integer" + format: "int64" + example: 3987495 + Containers: + description: | + The number of containers that are using this specific platform image. + type: "integer" + format: "int64" + example: 2 + + paths: /containers/json: get: diff --git a/vendor/github.com/docker/docker/api/types/image/platform_image.go b/vendor/github.com/docker/docker/api/types/image/platform_image.go new file mode 100644 index 000000000000..a9f6849ac763 --- /dev/null +++ b/vendor/github.com/docker/docker/api/types/image/platform_image.go @@ -0,0 +1,43 @@ +package image + +import ( + ocispec "github.com/opencontainers/image-spec/specs-go/v1" +) + +type PlatformImage struct { + // ID is the content-addressable ID of an image and is the same as the + // digest of the platform-specific image manifest. + // + // Required: true + ID string `json:"Id"` + + // Descriptor is the OCI descriptor of the image. + // + // Required: true + Descriptor ocispec.Descriptor `json:"Descriptor"` + + // Available indicates whether the image is locally available. + // + // Required: true + Available bool `json:"Available"` + + // Platform is the platform of the image + // + // Required: true + Platform ocispec.Platform `json:"Platform"` + + // ContentSize is the size of all the locally available distributable content size. + // + // Required: true + ContentSize int64 `json:"ContentSize"` + + // UnpackedSize is the size of the image when unpacked. + // + // Required: true + UnpackedSize int64 `json:"UnpackedSize"` + + // Containers is the number of containers created from this image. + // + // Required: true + Containers int64 `json:"Containers"` +} diff --git a/vendor/github.com/docker/docker/api/types/image/summary.go b/vendor/github.com/docker/docker/api/types/image/summary.go index f1e3e2ef018f..4ebbdeadf704 100644 --- a/vendor/github.com/docker/docker/api/types/image/summary.go +++ b/vendor/github.com/docker/docker/api/types/image/summary.go @@ -47,6 +47,15 @@ type Summary struct { // Required: true ParentID string `json:"ParentId"` + // Platform-specific images available for this image. + // + // Only present with the containerd integration enabled. + // + // WARNING: This is experimental and may change at any time without any backward + // compatibility. + // + PlatformImages []PlatformImage `json:"PlatformImages,omitempty"` + // List of content-addressable digests of locally available image manifests // that the image is referenced from. Multiple manifests can refer to the // same image. diff --git a/vendor/modules.txt b/vendor/modules.txt index e7cedc534c54..2eed9c30bb12 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -56,7 +56,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 v26.0.0+incompatible +# github.com/docker/docker v26.0.0+incompatible => github.com/vvoland/moby v20.10.3-0.20240404141845-f7c6a8316acc+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types @@ -548,3 +548,4 @@ gotest.tools/v3/skip # tags.cncf.io/container-device-interface v0.6.2 ## explicit; go 1.19 tags.cncf.io/container-device-interface/pkg/parser +# github.com/docker/docker => github.com/vvoland/moby v20.10.3-0.20240404141845-f7c6a8316acc+incompatible