Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vendor: github.com/docker/docker cb01202de88e20d5699c76efe948dfb065da873f 

no changes in vendored code other than a typo-fix, just aligning with latest master

8abb84c734...cb01202de8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-05-28 23:37:46 +02:00
parent 14962747e4
commit 73c6231b4b
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.mod
View File

@ -76,7 +76,7 @@ require (
) )
replace ( replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220520155652-8abb84c7342a+incompatible // master (v22.06-dev) github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220528210301-cb01202de88e+incompatible // master (v22.06-dev)
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
// Resolve dependency hell with github.com/cloudflare/cfssl (transitive via // Resolve dependency hell with github.com/cloudflare/cfssl (transitive via

4
vendor.sum
View File

@ -105,8 +105,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xb
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20220520155652-8abb84c7342a+incompatible h1:o4OdN3hkN26XNH6g96X536mdfvOQhZJnHWigJWj1kMo= github.com/docker/docker v20.10.3-0.20220528210301-cb01202de88e+incompatible h1:RnCjw82r3wn7omT1GBOX5dUDTyVZ4ONyUNXYG3QahI0=
github.com/docker/docker v20.10.3-0.20220520155652-8abb84c7342a+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.3-0.20220528210301-cb01202de88e+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o=
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

11
vendor/github.com/docker/docker/api/swagger.yaml generated vendored
View File

@ -771,11 +771,13 @@ definitions:
The time to wait between checks in nanoseconds. It should be 0 or at The time to wait between checks in nanoseconds. It should be 0 or at
least 1000000 (1 ms). 0 means inherit. least 1000000 (1 ms). 0 means inherit.
type: "integer" type: "integer"
format: "int64"
Timeout: Timeout:
description: | description: |
The time to wait before considering the check to have hung. It should The time to wait before considering the check to have hung. It should
be 0 or at least 1000000 (1 ms). 0 means inherit. be 0 or at least 1000000 (1 ms). 0 means inherit.
type: "integer" type: "integer"
format: "int64"
Retries: Retries:
description: | description: |
The number of consecutive failures needed to consider a container as The number of consecutive failures needed to consider a container as
@ -787,6 +789,7 @@ definitions:
health-retries countdown in nanoseconds. It should be 0 or at least health-retries countdown in nanoseconds. It should be 0 or at least
1000000 (1 ms). 0 means inherit. 1000000 (1 ms). 0 means inherit.
type: "integer" type: "integer"
format: "int64"
Health: Health:
description: | description: |
@ -1625,7 +1628,7 @@ definitions:
List of image names/tags in the local image cache that reference this List of image names/tags in the local image cache that reference this
image. image.
Multiple image tags can refer to the same imagem and this list may be Multiple image tags can refer to the same image, and this list may be
empty if no tags reference the image, in which case the image is empty if no tags reference the image, in which case the image is
"untagged", in which case it can still be referenced by its ID. "untagged", in which case it can still be referenced by its ID.
type: "array" type: "array"
@ -1826,7 +1829,7 @@ definitions:
List of image names/tags in the local image cache that reference this List of image names/tags in the local image cache that reference this
image. image.
Multiple image tags can refer to the same imagem and this list may be Multiple image tags can refer to the same image, and this list may be
empty if no tags reference the image, in which case the image is empty if no tags reference the image, in which case the image is
"untagged", in which case it can still be referenced by its ID. "untagged", in which case it can still be referenced by its ID.
type: "array" type: "array"
@ -1876,6 +1879,7 @@ definitions:
This size is not calculated by default. `-1` indicates that the value This size is not calculated by default. `-1` indicates that the value
has not been set / calculated. has not been set / calculated.
type: "integer" type: "integer"
format: "int64"
x-nullable: false x-nullable: false
example: 1239828 example: 1239828
VirtualSize: VirtualSize:
@ -2023,6 +2027,7 @@ definitions:
properties: properties:
Size: Size:
type: "integer" type: "integer"
format: "int64"
default: -1 default: -1
description: | description: |
Amount of disk space used by the volume (in bytes). This information Amount of disk space used by the volume (in bytes). This information
@ -2032,6 +2037,7 @@ definitions:
x-nullable: false x-nullable: false
RefCount: RefCount:
type: "integer" type: "integer"
format: "int64"
default: -1 default: -1
description: | description: |
The number of containers referencing this volume. This field The number of containers referencing this volume. This field
@ -4655,6 +4661,7 @@ definitions:
StatusCode: StatusCode:
description: "Exit code of the container" description: "Exit code of the container"
type: "integer" type: "integer"
format: "int64"
x-nullable: false x-nullable: false
Error: Error:
$ref: "#/definitions/ContainerWaitExitError" $ref: "#/definitions/ContainerWaitExitError"

2
vendor/github.com/docker/docker/api/types/image_summary.go generated vendored
View File

@ -61,7 +61,7 @@ type ImageSummary struct {
// List of image names/tags in the local image cache that reference this // List of image names/tags in the local image cache that reference this
// image. // image.
// //
// Multiple image tags can refer to the same imagem and this list may be // Multiple image tags can refer to the same image, and this list may be
// empty if no tags reference the image, in which case the image is // empty if no tags reference the image, in which case the image is
// "untagged", in which case it can still be referenced by its ID. // "untagged", in which case it can still be referenced by its ID.
// //

2
vendor/github.com/docker/docker/api/types/types.go generated vendored
View File

@ -48,7 +48,7 @@ type ImageInspect struct {
// RepoTags is a list of image names/tags in the local image cache that // RepoTags is a list of image names/tags in the local image cache that
// reference this image. // reference this image.
// //
// Multiple image tags can refer to the same imagem and this list may be // Multiple image tags can refer to the same image, and this list may be
// empty if no tags reference the image, in which case the image is // empty if no tags reference the image, in which case the image is
// "untagged", in which case it can still be referenced by its ID. // "untagged", in which case it can still be referenced by its ID.
RepoTags []string RepoTags []string

4
vendor/modules.txt vendored
View File

@ -39,7 +39,7 @@ github.com/docker/distribution/registry/client/transport
github.com/docker/distribution/registry/storage/cache github.com/docker/distribution/registry/storage/cache
github.com/docker/distribution/registry/storage/cache/memory github.com/docker/distribution/registry/storage/cache/memory
github.com/docker/distribution/uuid github.com/docker/distribution/uuid
# github.com/docker/docker v20.10.14+incompatible => github.com/docker/docker v20.10.3-0.20220520155652-8abb84c7342a+incompatible # github.com/docker/docker v20.10.14+incompatible => github.com/docker/docker v20.10.3-0.20220528210301-cb01202de88e+incompatible
## explicit ## explicit
github.com/docker/docker/api github.com/docker/docker/api
github.com/docker/docker/api/types github.com/docker/docker/api/types
@ -390,6 +390,6 @@ gotest.tools/v3/internal/format
gotest.tools/v3/internal/source gotest.tools/v3/internal/source
gotest.tools/v3/poll gotest.tools/v3/poll
gotest.tools/v3/skip gotest.tools/v3/skip
# github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220520155652-8abb84c7342a+incompatible # github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220528210301-cb01202de88e+incompatible
# github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 # github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
# github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20 # github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20