mirror of https://github.com/docker/cli.git
vendor: github.com/docker/docker v25.0.0-rc.1
full diff: https://github.com/docker/docker/compare/v25.0.0-beta.3...v25.0.0-rc.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
8812e0ad3a
commit
b43ea528b8
|
@ -12,7 +12,7 @@ require (
|
||||||
github.com/creack/pty v1.1.18
|
github.com/creack/pty v1.1.18
|
||||||
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 v25.0.0-beta.3+incompatible
|
github.com/docker/docker v25.0.0-rc.1+incompatible
|
||||||
github.com/docker/docker-credential-helpers v0.8.0
|
github.com/docker/docker-credential-helpers v0.8.0
|
||||||
github.com/docker/go-connections v0.4.1-0.20231110212414-fa09c952e3ea
|
github.com/docker/go-connections v0.4.1-0.20231110212414-fa09c952e3ea
|
||||||
github.com/docker/go-units v0.5.0
|
github.com/docker/go-units v0.5.0
|
||||||
|
|
|
@ -54,8 +54,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 v25.0.0-beta.3+incompatible h1:aoDCVh2PkQ4M/XfvKIJ6MoTPR+RFvwMVfkLqFZKCXS4=
|
github.com/docker/docker v25.0.0-rc.1+incompatible h1:Bdb06U1Z1P78uxluMZE6MI94tGICXzWnArsiW5hg6pU=
|
||||||
github.com/docker/docker v25.0.0-beta.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
github.com/docker/docker v25.0.0-rc.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||||
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
|
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
|
||||||
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
|
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
|
||||||
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=
|
||||||
|
|
|
@ -238,6 +238,7 @@ Ben Golub <ben.golub@dotcloud.com>
|
||||||
Ben Gould <ben@bengould.co.uk>
|
Ben Gould <ben@bengould.co.uk>
|
||||||
Ben Hall <ben@benhall.me.uk>
|
Ben Hall <ben@benhall.me.uk>
|
||||||
Ben Langfeld <ben@langfeld.me>
|
Ben Langfeld <ben@langfeld.me>
|
||||||
|
Ben Lovy <ben@deciduously.com>
|
||||||
Ben Sargent <ben@brokendigits.com>
|
Ben Sargent <ben@brokendigits.com>
|
||||||
Ben Severson <BenSeverson@users.noreply.github.com>
|
Ben Severson <BenSeverson@users.noreply.github.com>
|
||||||
Ben Toews <mastahyeti@gmail.com>
|
Ben Toews <mastahyeti@gmail.com>
|
||||||
|
@ -1399,6 +1400,7 @@ Martijn van Oosterhout <kleptog@svana.org>
|
||||||
Martin Braun <braun@neuroforge.de>
|
Martin Braun <braun@neuroforge.de>
|
||||||
Martin Dojcak <martin.dojcak@lablabs.io>
|
Martin Dojcak <martin.dojcak@lablabs.io>
|
||||||
Martin Honermeyer <maze@strahlungsfrei.de>
|
Martin Honermeyer <maze@strahlungsfrei.de>
|
||||||
|
Martin Jirku <martin@jirku.sk>
|
||||||
Martin Kelly <martin@surround.io>
|
Martin Kelly <martin@surround.io>
|
||||||
Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
|
Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
|
||||||
Martin Muzatko <martin@happy-css.com>
|
Martin Muzatko <martin@happy-css.com>
|
||||||
|
@ -1477,6 +1479,7 @@ Michael Holzheu <holzheu@linux.vnet.ibm.com>
|
||||||
Michael Hudson-Doyle <michael.hudson@canonical.com>
|
Michael Hudson-Doyle <michael.hudson@canonical.com>
|
||||||
Michael Huettermann <michael@huettermann.net>
|
Michael Huettermann <michael@huettermann.net>
|
||||||
Michael Irwin <mikesir87@gmail.com>
|
Michael Irwin <mikesir87@gmail.com>
|
||||||
|
Michael Kebe <michael.kebe@hkm.de>
|
||||||
Michael Kuehn <micha@kuehn.io>
|
Michael Kuehn <micha@kuehn.io>
|
||||||
Michael Käufl <docker@c.michael-kaeufl.de>
|
Michael Käufl <docker@c.michael-kaeufl.de>
|
||||||
Michael Neale <michael.neale@gmail.com>
|
Michael Neale <michael.neale@gmail.com>
|
||||||
|
@ -1813,6 +1816,7 @@ Ritesh H Shukla <sritesh@vmware.com>
|
||||||
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
|
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
|
||||||
Rob Cowsill <42620235+rcowsill@users.noreply.github.com>
|
Rob Cowsill <42620235+rcowsill@users.noreply.github.com>
|
||||||
Rob Gulewich <rgulewich@netflix.com>
|
Rob Gulewich <rgulewich@netflix.com>
|
||||||
|
Rob Murray <rob.murray@docker.com>
|
||||||
Rob Vesse <rvesse@dotnetrdf.org>
|
Rob Vesse <rvesse@dotnetrdf.org>
|
||||||
Robert Bachmann <rb@robertbachmann.at>
|
Robert Bachmann <rb@robertbachmann.at>
|
||||||
Robert Bittle <guywithnose@gmail.com>
|
Robert Bittle <guywithnose@gmail.com>
|
||||||
|
|
|
@ -1398,7 +1398,8 @@ definitions:
|
||||||
type: "object"
|
type: "object"
|
||||||
properties:
|
properties:
|
||||||
Bridge:
|
Bridge:
|
||||||
description: Name of the network's bridge (for example, `docker0`).
|
description: |
|
||||||
|
Name of the default bridge interface when dockerd's --bridge flag is set.
|
||||||
type: "string"
|
type: "string"
|
||||||
example: "docker0"
|
example: "docker0"
|
||||||
SandboxID:
|
SandboxID:
|
||||||
|
@ -1408,34 +1409,40 @@ definitions:
|
||||||
HairpinMode:
|
HairpinMode:
|
||||||
description: |
|
description: |
|
||||||
Indicates if hairpin NAT should be enabled on the virtual interface.
|
Indicates if hairpin NAT should be enabled on the virtual interface.
|
||||||
|
|
||||||
|
Deprecated: This field is never set and will be removed in a future release.
|
||||||
type: "boolean"
|
type: "boolean"
|
||||||
example: false
|
example: false
|
||||||
LinkLocalIPv6Address:
|
LinkLocalIPv6Address:
|
||||||
description: IPv6 unicast address using the link-local prefix.
|
description: |
|
||||||
|
IPv6 unicast address using the link-local prefix.
|
||||||
|
|
||||||
|
Deprecated: This field is never set and will be removed in a future release.
|
||||||
type: "string"
|
type: "string"
|
||||||
example: "fe80::42:acff:fe11:1"
|
example: ""
|
||||||
LinkLocalIPv6PrefixLen:
|
LinkLocalIPv6PrefixLen:
|
||||||
description: Prefix length of the IPv6 unicast address.
|
description: |
|
||||||
|
Prefix length of the IPv6 unicast address.
|
||||||
|
|
||||||
|
Deprecated: This field is never set and will be removed in a future release.
|
||||||
type: "integer"
|
type: "integer"
|
||||||
example: "64"
|
example: ""
|
||||||
Ports:
|
Ports:
|
||||||
$ref: "#/definitions/PortMap"
|
$ref: "#/definitions/PortMap"
|
||||||
SandboxKey:
|
SandboxKey:
|
||||||
description: SandboxKey identifies the sandbox
|
description: SandboxKey is the full path of the netns handle
|
||||||
type: "string"
|
type: "string"
|
||||||
example: "/var/run/docker/netns/8ab54b426c38"
|
example: "/var/run/docker/netns/8ab54b426c38"
|
||||||
|
|
||||||
# TODO is SecondaryIPAddresses actually used?
|
|
||||||
SecondaryIPAddresses:
|
SecondaryIPAddresses:
|
||||||
description: ""
|
description: "Deprecated: This field is never set and will be removed in a future release."
|
||||||
type: "array"
|
type: "array"
|
||||||
items:
|
items:
|
||||||
$ref: "#/definitions/Address"
|
$ref: "#/definitions/Address"
|
||||||
x-nullable: true
|
x-nullable: true
|
||||||
|
|
||||||
# TODO is SecondaryIPv6Addresses actually used?
|
|
||||||
SecondaryIPv6Addresses:
|
SecondaryIPv6Addresses:
|
||||||
description: ""
|
description: "Deprecated: This field is never set and will be removed in a future release."
|
||||||
type: "array"
|
type: "array"
|
||||||
items:
|
items:
|
||||||
$ref: "#/definitions/Address"
|
$ref: "#/definitions/Address"
|
||||||
|
|
|
@ -339,17 +339,27 @@ type SummaryNetworkSettings struct {
|
||||||
Networks map[string]*network.EndpointSettings
|
Networks map[string]*network.EndpointSettings
|
||||||
}
|
}
|
||||||
|
|
||||||
// NetworkSettingsBase holds basic information about networks
|
// NetworkSettingsBase holds networking state for a container when inspecting it.
|
||||||
type NetworkSettingsBase struct {
|
type NetworkSettingsBase struct {
|
||||||
Bridge string // Bridge is the Bridge name the network uses(e.g. `docker0`)
|
Bridge string // Bridge contains the name of the default bridge interface iff it was set through the daemon --bridge flag.
|
||||||
SandboxID string // SandboxID uniquely represents a container's network stack
|
SandboxID string // SandboxID uniquely represents a container's network stack
|
||||||
HairpinMode bool // HairpinMode specifies if hairpin NAT should be enabled on the virtual interface
|
SandboxKey string // SandboxKey identifies the sandbox
|
||||||
LinkLocalIPv6Address string // LinkLocalIPv6Address is an IPv6 unicast address using the link-local prefix
|
Ports nat.PortMap // Ports is a collection of PortBinding indexed by Port
|
||||||
LinkLocalIPv6PrefixLen int // LinkLocalIPv6PrefixLen is the prefix length of an IPv6 unicast address
|
|
||||||
Ports nat.PortMap // Ports is a collection of PortBinding indexed by Port
|
// HairpinMode specifies if hairpin NAT should be enabled on the virtual interface
|
||||||
SandboxKey string // SandboxKey identifies the sandbox
|
//
|
||||||
SecondaryIPAddresses []network.Address
|
// Deprecated: This field is never set and will be removed in a future release.
|
||||||
SecondaryIPv6Addresses []network.Address
|
HairpinMode bool
|
||||||
|
// LinkLocalIPv6Address is an IPv6 unicast address using the link-local prefix
|
||||||
|
//
|
||||||
|
// Deprecated: This field is never set and will be removed in a future release.
|
||||||
|
LinkLocalIPv6Address string
|
||||||
|
// LinkLocalIPv6PrefixLen is the prefix length of an IPv6 unicast address
|
||||||
|
//
|
||||||
|
// Deprecated: This field is never set and will be removed in a future release.
|
||||||
|
LinkLocalIPv6PrefixLen int
|
||||||
|
SecondaryIPAddresses []network.Address // Deprecated: This field is never set and will be removed in a future release.
|
||||||
|
SecondaryIPv6Addresses []network.Address // Deprecated: This field is never set and will be removed in a future release.
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultNetworkSettings holds network information
|
// DefaultNetworkSettings holds network information
|
||||||
|
|
|
@ -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
|
||||||
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 v25.0.0-beta.3+incompatible
|
# github.com/docker/docker v25.0.0-rc.1+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
|
||||||
|
|
Loading…
Reference in New Issue