vendor: github.com/docker/docker de5c9cf0b96e (v26.1.4-dev)

updating to tip of the v26.1 branch, which will be v26.1.4

full diff: https://github.com/docker/docker/compare/v26.1.3...de5c9cf0b96e4e172b96db54abababa4a328462f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2024-06-04 22:26:12 +02:00
Родитель 2acb9c2e8f
Коммит e8bc27d4ca
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 76698F39D527CE8C
5 изменённых файлов: 171 добавлений и 79 удалений

Просмотреть файл

@ -12,7 +12,7 @@ require (
github.com/creack/pty v1.1.21 github.com/creack/pty v1.1.21
github.com/distribution/reference v0.5.0 github.com/distribution/reference v0.5.0
github.com/docker/distribution v2.8.3+incompatible github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v26.1.3+incompatible github.com/docker/docker v26.1.4-0.20240605103321-de5c9cf0b96e+incompatible // 26.1 branch (v26.1.4-dev)
github.com/docker/docker-credential-helpers v0.8.1 github.com/docker/docker-credential-helpers v0.8.1
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

Просмотреть файл

@ -59,8 +59,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.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 v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo= github.com/docker/docker v26.1.4-0.20240605103321-de5c9cf0b96e+incompatible h1:Zx3pZjoBZhEwxP38O4F6/NtfbhUIxzsz3H1N15dmZw8=
github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v26.1.4-0.20240605103321-de5c9cf0b96e+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 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= 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= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=

216
vendor/github.com/docker/docker/api/swagger.yaml сгенерированный поставляемый
Просмотреть файл

@ -2179,72 +2179,129 @@ definitions:
type: "object" type: "object"
properties: properties:
Name: Name:
description: |
Name of the network.
type: "string" type: "string"
example: "my_network"
Id: Id:
description: |
ID that uniquely identifies a network on a single machine.
type: "string" type: "string"
example: "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99"
Created: Created:
description: |
Date and time at which the network was created in
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
type: "string" type: "string"
format: "dateTime" format: "dateTime"
example: "2016-10-19T04:33:30.360899459Z"
Scope: Scope:
description: |
The level at which the network exists (e.g. `swarm` for cluster-wide
or `local` for machine level)
type: "string" type: "string"
example: "local"
Driver: Driver:
description: |
The name of the driver used to create the network (e.g. `bridge`,
`overlay`).
type: "string" type: "string"
example: "overlay"
EnableIPv6: EnableIPv6:
description: |
Whether the network was created with IPv6 enabled.
type: "boolean" type: "boolean"
example: false
IPAM: IPAM:
$ref: "#/definitions/IPAM" $ref: "#/definitions/IPAM"
Internal: Internal:
description: |
Whether the network is created to only allow internal networking
connectivity.
type: "boolean" type: "boolean"
default: false
example: false
Attachable: Attachable:
description: |
Wheter a global / swarm scope network is manually attachable by regular
containers from workers in swarm mode.
type: "boolean" type: "boolean"
default: false
example: false
Ingress: Ingress:
description: |
Whether the network is providing the routing-mesh for the swarm cluster.
type: "boolean" type: "boolean"
default: false
example: false
ConfigFrom:
$ref: "#/definitions/ConfigReference"
ConfigOnly:
description: |
Whether the network is a config-only network. Config-only networks are
placeholder networks for network configurations to be used by other
networks. Config-only networks cannot be used directly to run containers
or services.
type: "boolean"
default: false
Containers: Containers:
description: |
Contains endpoints attached to the network.
type: "object" type: "object"
additionalProperties: additionalProperties:
$ref: "#/definitions/NetworkContainer" $ref: "#/definitions/NetworkContainer"
example:
19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c:
Name: "test"
EndpointID: "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a"
MacAddress: "02:42:ac:13:00:02"
IPv4Address: "172.19.0.2/16"
IPv6Address: ""
Options: Options:
description: |
Network-specific options uses when creating the network.
type: "object" type: "object"
additionalProperties: additionalProperties:
type: "string" type: "string"
example:
com.docker.network.bridge.default_bridge: "true"
com.docker.network.bridge.enable_icc: "true"
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
com.docker.network.bridge.name: "docker0"
com.docker.network.driver.mtu: "1500"
Labels: Labels:
description: "User-defined key/value metadata."
type: "object" type: "object"
additionalProperties: additionalProperties:
type: "string" type: "string"
example: example:
Name: "net01" com.example.some-label: "some-value"
Id: "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99" com.example.some-other-label: "some-other-value"
Created: "2016-10-19T04:33:30.360899459Z" Peers:
Scope: "local" description: |
Driver: "bridge" List of peer nodes for an overlay network. This field is only present
EnableIPv6: false for overlay networks, and omitted for other network types.
IPAM: type: "array"
Driver: "default" items:
Config: $ref: "#/definitions/PeerInfo"
- Subnet: "172.19.0.0/16" x-nullable: true
Gateway: "172.19.0.1" # TODO: Add Services (only present when "verbose" is set).
Options:
foo: "bar" ConfigReference:
Internal: false description: |
Attachable: false The config-only network source to provide the configuration for
Ingress: false this network.
Containers: type: "object"
19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c: properties:
Name: "test" Network:
EndpointID: "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a" description: |
MacAddress: "02:42:ac:13:00:02" The name of the config-only network that provides the network's
IPv4Address: "172.19.0.2/16" configuration. The specified network must be an existing config-only
IPv6Address: "" network. Only network names are allowed, not network IDs.
Options: type: "string"
com.docker.network.bridge.default_bridge: "true" example: "config_only_network_01"
com.docker.network.bridge.enable_icc: "true"
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
com.docker.network.bridge.name: "docker0"
com.docker.network.driver.mtu: "1500"
Labels:
com.example.some-label: "some-value"
com.example.some-other-label: "some-other-value"
IPAM: IPAM:
type: "object" type: "object"
properties: properties:
@ -2252,6 +2309,7 @@ definitions:
description: "Name of the IPAM driver to use." description: "Name of the IPAM driver to use."
type: "string" type: "string"
default: "default" default: "default"
example: "default"
Config: Config:
description: | description: |
List of IPAM configuration options, specified as a map: List of IPAM configuration options, specified as a map:
@ -2267,16 +2325,21 @@ definitions:
type: "object" type: "object"
additionalProperties: additionalProperties:
type: "string" type: "string"
example:
foo: "bar"
IPAMConfig: IPAMConfig:
type: "object" type: "object"
properties: properties:
Subnet: Subnet:
type: "string" type: "string"
example: "172.20.0.0/16"
IPRange: IPRange:
type: "string" type: "string"
example: "172.20.10.0/24"
Gateway: Gateway:
type: "string" type: "string"
example: "172.20.10.11"
AuxiliaryAddresses: AuxiliaryAddresses:
type: "object" type: "object"
additionalProperties: additionalProperties:
@ -2287,14 +2350,35 @@ definitions:
properties: properties:
Name: Name:
type: "string" type: "string"
example: "container_1"
EndpointID: EndpointID:
type: "string" type: "string"
example: "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a"
MacAddress: MacAddress:
type: "string" type: "string"
example: "02:42:ac:13:00:02"
IPv4Address: IPv4Address:
type: "string" type: "string"
example: "172.19.0.2/16"
IPv6Address: IPv6Address:
type: "string" type: "string"
example: ""
PeerInfo:
description: |
PeerInfo represents one peer of an overlay network.
type: "object"
properties:
Name:
description:
ID of the peer-node in the Swarm cluster.
type: "string"
example: "6869d7c1732b"
IP:
description:
IP-address of the peer-node in the Swarm cluster.
type: "string"
example: "10.133.77.91"
BuildInfo: BuildInfo:
type: "object" type: "object"
@ -10104,14 +10188,22 @@ paths:
Name: Name:
description: "The network's name." description: "The network's name."
type: "string" type: "string"
example: "my_network"
CheckDuplicate: CheckDuplicate:
description: | description: |
Deprecated: CheckDuplicate is now always enabled. Deprecated: CheckDuplicate is now always enabled.
type: "boolean" type: "boolean"
example: true
Driver: Driver:
description: "Name of the network driver plugin to use." description: "Name of the network driver plugin to use."
type: "string" type: "string"
default: "bridge" default: "bridge"
example: "bridge"
Scope:
description: |
The level at which the network exists (e.g. `swarm` for cluster-wide
or `local` for machine level).
type: "string"
Internal: Internal:
description: "Restrict external access to the network." description: "Restrict external access to the network."
type: "boolean" type: "boolean"
@ -10120,55 +10212,55 @@ paths:
Globally scoped network is manually attachable by regular Globally scoped network is manually attachable by regular
containers from workers in swarm mode. containers from workers in swarm mode.
type: "boolean" type: "boolean"
example: true
Ingress: Ingress:
description: | description: |
Ingress network is the network which provides the routing-mesh Ingress network is the network which provides the routing-mesh
in swarm mode. in swarm mode.
type: "boolean" type: "boolean"
example: false
ConfigOnly:
description: |
Creates a config-only network. Config-only networks are placeholder
networks for network configurations to be used by other networks.
Config-only networks cannot be used directly to run containers
or services.
type: "boolean"
default: false
example: false
ConfigFrom:
description: |
Specifies the source which will provide the configuration for
this network. The specified network must be an existing
config-only network; see ConfigOnly.
$ref: "#/definitions/ConfigReference"
IPAM: IPAM:
description: "Optional custom IP scheme for the network." description: "Optional custom IP scheme for the network."
$ref: "#/definitions/IPAM" $ref: "#/definitions/IPAM"
EnableIPv6: EnableIPv6:
description: "Enable IPv6 on the network." description: "Enable IPv6 on the network."
type: "boolean" type: "boolean"
example: true
Options: Options:
description: "Network specific options to be used by the drivers." description: "Network specific options to be used by the drivers."
type: "object" type: "object"
additionalProperties: additionalProperties:
type: "string" type: "string"
example:
com.docker.network.bridge.default_bridge: "true"
com.docker.network.bridge.enable_icc: "true"
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
com.docker.network.bridge.name: "docker0"
com.docker.network.driver.mtu: "1500"
Labels: Labels:
description: "User-defined key/value metadata." description: "User-defined key/value metadata."
type: "object" type: "object"
additionalProperties: additionalProperties:
type: "string" type: "string"
example: example:
Name: "isolated_nw" com.example.some-label: "some-value"
CheckDuplicate: false com.example.some-other-label: "some-other-value"
Driver: "bridge"
EnableIPv6: true
IPAM:
Driver: "default"
Config:
- Subnet: "172.20.0.0/16"
IPRange: "172.20.10.0/24"
Gateway: "172.20.10.11"
- Subnet: "2001:db8:abcd::/64"
Gateway: "2001:db8:abcd::1011"
Options:
foo: "bar"
Internal: true
Attachable: false
Ingress: false
Options:
com.docker.network.bridge.default_bridge: "true"
com.docker.network.bridge.enable_icc: "true"
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
com.docker.network.bridge.name: "docker0"
com.docker.network.driver.mtu: "1500"
Labels:
com.example.some-label: "some-value"
com.example.some-other-label: "some-other-value"
tags: ["Network"] tags: ["Network"]
/networks/{id}/connect: /networks/{id}/connect:

26
vendor/github.com/docker/docker/api/types/types.go сгенерированный поставляемый
Просмотреть файл

@ -457,24 +457,24 @@ type EndpointResource struct {
type NetworkCreate struct { type NetworkCreate struct {
// Deprecated: CheckDuplicate is deprecated since API v1.44, but it defaults to true when sent by the client // Deprecated: CheckDuplicate is deprecated since API v1.44, but it defaults to true when sent by the client
// package to older daemons. // package to older daemons.
CheckDuplicate bool `json:",omitempty"` CheckDuplicate bool `json:",omitempty"`
Driver string Driver string // Driver is the driver-name used to create the network (e.g. `bridge`, `overlay`)
Scope string Scope string // Scope describes the level at which the network exists (e.g. `swarm` for cluster-wide or `local` for machine level).
EnableIPv6 bool EnableIPv6 bool // EnableIPv6 represents whether to enable IPv6.
IPAM *network.IPAM IPAM *network.IPAM // IPAM is the network's IP Address Management.
Internal bool Internal bool // Internal represents if the network is used internal only.
Attachable bool Attachable bool // Attachable represents if the global scope is manually attachable by regular containers from workers in swarm mode.
Ingress bool Ingress bool // Ingress indicates the network is providing the routing-mesh for the swarm cluster.
ConfigOnly bool ConfigOnly bool // ConfigOnly creates a config-only network. Config-only networks are place-holder networks for network configurations to be used by other networks. ConfigOnly networks cannot be used directly to run containers or services.
ConfigFrom *network.ConfigReference ConfigFrom *network.ConfigReference // ConfigFrom specifies the source which will provide the configuration for this network. The specified network must be a config-only network; see [NetworkCreate.ConfigOnly].
Options map[string]string Options map[string]string // Options specifies the network-specific options to use for when creating the network.
Labels map[string]string Labels map[string]string // Labels holds metadata specific to the network being created.
} }
// NetworkCreateRequest is the request message sent to the server for network create call. // NetworkCreateRequest is the request message sent to the server for network create call.
type NetworkCreateRequest struct { type NetworkCreateRequest struct {
NetworkCreate NetworkCreate
Name string Name string // Name is the requested name of the network.
} }
// NetworkCreateResponse is the response message sent by the server for network create call // NetworkCreateResponse is the response message sent by the server for network create call

2
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
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 v26.1.3+incompatible # github.com/docker/docker v26.1.4-0.20240605103321-de5c9cf0b96e+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