Merge pull request #5431 from thaJeztah/27.x_bump_engine2

[27.x] vendor: github.com/docker/docker bf60e5cced83 (v27.3.0-dev)
This commit is contained in:
Sebastiaan van Stijn 2024-09-13 00:34:34 +02:00 committed by GitHub
commit c85c3df6b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 42 additions and 31 deletions

View File

@ -13,7 +13,7 @@ require (
github.com/distribution/reference v0.6.0 github.com/distribution/reference v0.6.0
github.com/docker/cli-docs-tool v0.8.0 github.com/docker/cli-docs-tool v0.8.0
github.com/docker/distribution v2.8.3+incompatible github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v27.2.1+incompatible github.com/docker/docker v27.2.2-0.20240912213415-bf60e5cced83+incompatible // 27.x branch / v27.3.0-dev
github.com/docker/docker-credential-helpers v0.8.2 github.com/docker/docker-credential-helpers v0.8.2
github.com/docker/go-connections v0.5.0 github.com/docker/go-connections v0.5.0
github.com/docker/go-units v0.5.0 github.com/docker/go-units v0.5.0

View File

@ -57,8 +57,8 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
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.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= 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/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v27.2.1+incompatible h1:fQdiLfW7VLscyoeYEBz7/J8soYFDZV1u6VW6gJEjNMI= github.com/docker/docker v27.2.2-0.20240912213415-bf60e5cced83+incompatible h1:OFHR9jugd3jgcQSzqynMgPecxBnmfnq3u8/Fh14Vh2U=
github.com/docker/docker v27.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.2.2-0.20240912213415-bf60e5cced83+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
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=

View File

@ -393,7 +393,7 @@ definitions:
Make the mount non-recursively read-only, but still leave the mount recursive Make the mount non-recursively read-only, but still leave the mount recursive
(unless NonRecursive is set to `true` in conjunction). (unless NonRecursive is set to `true` in conjunction).
Addded in v1.44, before that version all read-only mounts were Added in v1.44, before that version all read-only mounts were
non-recursive by default. To match the previous behaviour this non-recursive by default. To match the previous behaviour this
will default to `true` for clients on versions prior to v1.44. will default to `true` for clients on versions prior to v1.44.
type: "boolean" type: "boolean"
@ -1384,7 +1384,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always empty. It must not be used, and will be removed in API v1.47. > always empty. It must not be used, and will be removed in API v1.48.
type: "string" type: "string"
example: "" example: ""
Domainname: Domainname:
@ -1394,7 +1394,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always empty. It must not be used, and will be removed in API v1.47. > always empty. It must not be used, and will be removed in API v1.48.
type: "string" type: "string"
example: "" example: ""
User: User:
@ -1408,7 +1408,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1419,7 +1419,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1430,7 +1430,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1457,7 +1457,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1468,7 +1468,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1479,7 +1479,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always false. It must not be used, and will be removed in API v1.47. > always false. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1516,7 +1516,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always empty. It must not be used, and will be removed in API v1.47. > always empty. It must not be used, and will be removed in API v1.48.
type: "string" type: "string"
default: "" default: ""
example: "" example: ""
@ -1555,7 +1555,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always omitted. It must not be used, and will be removed in API v1.47. > always omitted. It must not be used, and will be removed in API v1.48.
type: "boolean" type: "boolean"
default: false default: false
example: false example: false
@ -1567,7 +1567,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always omitted. It must not be used, and will be removed in API v1.47. > always omitted. It must not be used, and will be removed in API v1.48.
type: "string" type: "string"
default: "" default: ""
example: "" example: ""
@ -1601,7 +1601,7 @@ definitions:
<p><br /></p> <p><br /></p>
> **Deprecated**: this field is not part of the image specification and is > **Deprecated**: this field is not part of the image specification and is
> always omitted. It must not be used, and will be removed in API v1.47. > always omitted. It must not be used, and will be removed in API v1.48.
type: "integer" type: "integer"
default: 10 default: 10
x-nullable: true x-nullable: true
@ -2216,7 +2216,7 @@ definitions:
Created: Created:
description: | description: |
Date and time at which the image was created as a Unix timestamp Date and time at which the image was created as a Unix timestamp
(number of seconds sinds EPOCH). (number of seconds since EPOCH).
type: "integer" type: "integer"
x-nullable: false x-nullable: false
example: "1644009612" example: "1644009612"
@ -2513,7 +2513,7 @@ definitions:
example: false example: false
Attachable: Attachable:
description: | description: |
Wheter a global / swarm scope network is manually attachable by regular Whether a global / swarm scope network is manually attachable by regular
containers from workers in swarm mode. containers from workers in swarm mode.
type: "boolean" type: "boolean"
default: false default: false
@ -3736,7 +3736,7 @@ definitions:
example: "json-file" example: "json-file"
Options: Options:
description: | description: |
Driver-specific options for the selectd log driver, specified Driver-specific options for the selected log driver, specified
as key/value pairs. as key/value pairs.
type: "object" type: "object"
additionalProperties: additionalProperties:
@ -7712,7 +7712,7 @@ paths:
* Memory usage % = `(used_memory / available_memory) * 100.0` * Memory usage % = `(used_memory / available_memory) * 100.0`
* cpu_delta = `cpu_stats.cpu_usage.total_usage - precpu_stats.cpu_usage.total_usage` * cpu_delta = `cpu_stats.cpu_usage.total_usage - precpu_stats.cpu_usage.total_usage`
* system_cpu_delta = `cpu_stats.system_cpu_usage - precpu_stats.system_cpu_usage` * system_cpu_delta = `cpu_stats.system_cpu_usage - precpu_stats.system_cpu_usage`
* number_cpus = `lenght(cpu_stats.cpu_usage.percpu_usage)` or `cpu_stats.online_cpus` * number_cpus = `length(cpu_stats.cpu_usage.percpu_usage)` or `cpu_stats.online_cpus`
* CPU usage % = `(cpu_delta / system_cpu_delta) * number_cpus * 100.0` * CPU usage % = `(cpu_delta / system_cpu_delta) * number_cpus * 100.0`
operationId: "ContainerStats" operationId: "ContainerStats"
produces: ["application/json"] produces: ["application/json"]
@ -9226,12 +9226,23 @@ paths:
parameters: parameters:
- name: "name" - name: "name"
in: "path" in: "path"
description: "Image name or ID." description: |
Name of the image to push. For example, `registry.example.com/myimage`.
The image must be present in the local image store with the same name.
The name should be provided without tag; if a tag is provided, it
is ignored. For example, `registry.example.com/myimage:latest` is
considered equivalent to `registry.example.com/myimage`.
Use the `tag` parameter to specify the tag to push.
type: "string" type: "string"
required: true required: true
- name: "tag" - name: "tag"
in: "query" in: "query"
description: "The tag to associate with the image on the registry." description: |
Tag of the image to push. For example, `latest`. If no tag is provided,
all tags of the given image that are present in the local image store
are pushed.
type: "string" type: "string"
- name: "X-Registry-Auth" - name: "X-Registry-Auth"
in: "header" in: "header"

View File

@ -196,7 +196,7 @@ func (args Args) Match(field, source string) bool {
} }
// GetBoolOrDefault returns a boolean value of the key if the key is present // GetBoolOrDefault returns a boolean value of the key if the key is present
// and is intepretable as a boolean value. Otherwise the default value is returned. // and is interpretable as a boolean value. Otherwise the default value is returned.
// Error is not nil only if the filter values are not valid boolean or are conflicting. // Error is not nil only if the filter values are not valid boolean or are conflicting.
func (args Args) GetBoolOrDefault(key string, defaultValue bool) (bool, error) { func (args Args) GetBoolOrDefault(key string, defaultValue bool) (bool, error) {
fieldValues, ok := args.fields[key] fieldValues, ok := args.fields[key]

View File

@ -12,7 +12,7 @@ type Summary struct {
Containers int64 `json:"Containers"` Containers int64 `json:"Containers"`
// Date and time at which the image was created as a Unix timestamp // Date and time at which the image was created as a Unix timestamp
// (number of seconds sinds EPOCH). // (number of seconds since EPOCH).
// //
// Required: true // Required: true
Created int64 `json:"Created"` Created int64 `json:"Created"`

View File

@ -122,7 +122,7 @@ type CAConfig struct {
SigningCAKey string `json:",omitempty"` SigningCAKey string `json:",omitempty"`
// If this value changes, and there is no specified signing cert and key, // If this value changes, and there is no specified signing cert and key,
// then the swarm is forced to generate a new root certificate ane key. // then the swarm is forced to generate a new root certificate and key.
ForceRotate uint64 `json:",omitempty"` ForceRotate uint64 `json:",omitempty"`
} }

View File

@ -414,7 +414,7 @@ type Info struct {
// the Volume has not been successfully created yet. // the Volume has not been successfully created yet.
VolumeID string `json:",omitempty"` VolumeID string `json:",omitempty"`
// AccessibleTopolgoy is the topology this volume is actually accessible // AccessibleTopology is the topology this volume is actually accessible
// from. // from.
AccessibleTopology []Topology `json:",omitempty"` AccessibleTopology []Topology `json:",omitempty"`
} }

View File

@ -290,7 +290,7 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
} }
// Stream is an io.Writer for output with utilities to get the output's file // Stream is an io.Writer for output with utilities to get the output's file
// descriptor and to detect wether it's a terminal. // descriptor and to detect whether it's a terminal.
// //
// it is subset of the streams.Out type in // it is subset of the streams.Out type in
// https://pkg.go.dev/github.com/docker/cli@v20.10.17+incompatible/cli/streams#Out // https://pkg.go.dev/github.com/docker/cli@v20.10.17+incompatible/cli/streams#Out

View File

@ -124,7 +124,7 @@ func (bufPool *BufioWriterPool) Put(b *bufio.Writer) {
} }
// NewWriteCloserWrapper returns a wrapper which puts the bufio.Writer back // NewWriteCloserWrapper returns a wrapper which puts the bufio.Writer back
// into the pool and closes the writer if it's an io.Writecloser. // into the pool and closes the writer if it's an io.WriteCloser.
func (bufPool *BufioWriterPool) NewWriteCloserWrapper(buf *bufio.Writer, w io.Writer) io.WriteCloser { func (bufPool *BufioWriterPool) NewWriteCloserWrapper(buf *bufio.Writer, w io.Writer) io.WriteCloser {
return ioutils.NewWriteCloserWrapper(w, func() error { return ioutils.NewWriteCloserWrapper(w, func() error {
buf.Flush() buf.Flush()

View File

@ -6,7 +6,7 @@ import (
// Lgetxattr retrieves the value of the extended attribute identified by attr // Lgetxattr retrieves the value of the extended attribute identified by attr
// and associated with the given path in the file system. // and associated with the given path in the file system.
// It will returns a nil slice and nil error if the xattr is not set. // It returns a nil slice and nil error if the xattr is not set.
func Lgetxattr(path string, attr string) ([]byte, error) { func Lgetxattr(path string, attr string) ([]byte, error) {
sysErr := func(err error) ([]byte, error) { sysErr := func(err error) ([]byte, error) {
return nil, &XattrError{Op: "lgetxattr", Attr: attr, Path: path, Err: err} return nil, &XattrError{Op: "lgetxattr", Attr: attr, Path: path, Err: err}

View File

@ -359,7 +359,7 @@ func hasScheme(reposName string) bool {
} }
func validateHostPort(s string) error { func validateHostPort(s string) error {
// Split host and port, and in case s can not be splitted, assume host only // Split host and port, and in case s can not be split, assume host only
host, port, err := net.SplitHostPort(s) host, port, err := net.SplitHostPort(s)
if err != nil { if err != nil {
host = s host = s

2
vendor/modules.txt vendored
View File

@ -55,7 +55,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 v27.2.1+incompatible # github.com/docker/docker v27.2.2-0.20240912213415-bf60e5cced83+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