From 38c3ff67aa8792f57a09382da44a2aef044045ad Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 16 Mar 2024 16:28:21 +0100 Subject: [PATCH] vendor: github.com/docker/docker 70e46f2c7c2d (v26.0.0-rc3-dev) full diff: https://github.com/docker/docker/compare/v26.0.0-rc2...70e46f2c7c2df8d8cc483d9831a907b12efa201b Signed-off-by: Sebastiaan van Stijn --- .../image/testdata/inspect-command-success.simple-many.golden | 4 ---- .../image/testdata/inspect-command-success.simple.golden | 2 -- vendor.mod | 2 +- vendor.sum | 4 ++-- vendor/github.com/docker/docker/api/types/types.go | 4 ++-- vendor/modules.txt | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/cli/command/image/testdata/inspect-command-success.simple-many.golden b/cli/command/image/testdata/inspect-command-success.simple-many.golden index f653d015e9..e563852725 100644 --- a/cli/command/image/testdata/inspect-command-success.simple-many.golden +++ b/cli/command/image/testdata/inspect-command-success.simple-many.golden @@ -5,8 +5,6 @@ "RepoDigests": null, "Parent": "", "Comment": "", - "Container": "", - "ContainerConfig": null, "DockerVersion": "", "Author": "", "Config": null, @@ -28,8 +26,6 @@ "RepoDigests": null, "Parent": "", "Comment": "", - "Container": "", - "ContainerConfig": null, "DockerVersion": "", "Author": "", "Config": null, diff --git a/cli/command/image/testdata/inspect-command-success.simple.golden b/cli/command/image/testdata/inspect-command-success.simple.golden index 4d595781fd..c8676749a7 100644 --- a/cli/command/image/testdata/inspect-command-success.simple.golden +++ b/cli/command/image/testdata/inspect-command-success.simple.golden @@ -5,8 +5,6 @@ "RepoDigests": null, "Parent": "", "Comment": "", - "Container": "", - "ContainerConfig": null, "DockerVersion": "", "Author": "", "Config": null, diff --git a/vendor.mod b/vendor.mod index 043383d0e3..218b5b35af 100644 --- a/vendor.mod +++ b/vendor.mod @@ -12,7 +12,7 @@ require ( github.com/creack/pty v1.1.21 github.com/distribution/reference v0.5.0 github.com/docker/distribution v2.8.3+incompatible - github.com/docker/docker v26.0.0-rc2+incompatible // 26.0.0-rc2 + github.com/docker/docker v26.0.0-rc2.0.20240316145409-70e46f2c7c2d+incompatible // master (v26.0.0-rc3-dev) github.com/docker/docker-credential-helpers v0.8.1 github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 diff --git a/vendor.sum b/vendor.sum index 2abc55227e..7aa2d414d6 100644 --- a/vendor.sum +++ b/vendor.sum @@ -57,8 +57,8 @@ 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-rc2+incompatible h1:EgOKh0HdpXSSmV7dvxqySuLU2qNEySrv+LxFixZ0/jM= -github.com/docker/docker v26.0.0-rc2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.0.0-rc2.0.20240316145409-70e46f2c7c2d+incompatible h1:caMsYR2ImIsgd1nlEtaNvDo5BJa6/4iLjbqQIwzFl8A= +github.com/docker/docker v26.0.0-rc2.0.20240316145409-70e46f2c7c2d+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= diff --git a/vendor/github.com/docker/docker/api/types/types.go b/vendor/github.com/docker/docker/api/types/types.go index 56a8b77d45..ca07162a20 100644 --- a/vendor/github.com/docker/docker/api/types/types.go +++ b/vendor/github.com/docker/docker/api/types/types.go @@ -82,7 +82,7 @@ type ImageInspect struct { // Depending on how the image was created, this field may be empty. // // Deprecated: this field is omitted in API v1.45, but kept for backward compatibility. - Container string + Container string `json:",omitempty"` // ContainerConfig is an optional field containing the configuration of the // container that was last committed when creating the image. @@ -91,7 +91,7 @@ type ImageInspect struct { // and it is not in active use anymore. // // Deprecated: this field is omitted in API v1.45, but kept for backward compatibility. - ContainerConfig *container.Config + ContainerConfig *container.Config `json:",omitempty"` // DockerVersion is the version of Docker that was used to build the image. // diff --git a/vendor/modules.txt b/vendor/modules.txt index 80c7005ece..efa31b0ae9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -53,7 +53,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-rc2+incompatible +# github.com/docker/docker v26.0.0-rc2.0.20240316145409-70e46f2c7c2d+incompatible ## explicit github.com/docker/docker/api github.com/docker/docker/api/types