Skip to content

Commit 8f85bbf

Browse files
committed
vendor: github.com/docker/go-connections v0.6.0
- deprecate sockets.GetProxyEnv, sockets.DialerFromEnvironment - add support for unix sockets on Windows - remove legacy CBC cipher suites from client config - align client and server defaults to be the same. - remove support for encrypted TLS private keys. - nat: optimize ParsePortSpec full diff: docker/go-connections@v0.5.0...v0.6.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent d16defd commit 8f85bbf

File tree

16 files changed

+223
-234
lines changed

16 files changed

+223
-234
lines changed

opts/swarmopts/port.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@ func (p *PortOpt) Value() []swarm.PortConfig {
147147
}
148148

149149
// ConvertPortToPortConfig converts ports to the swarm type
150-
func ConvertPortToPortConfig(
151-
portRangeProto container.PortRangeProto,
152-
portBindings map[container.PortRangeProto][]container.PortBinding,
153-
) ([]swarm.PortConfig, error) {
150+
func ConvertPortToPortConfig(portRangeProto container.PortRangeProto, portBindings map[container.PortRangeProto][]container.PortBinding) ([]swarm.PortConfig, error) {
154151
proto, port := nat.SplitProtoPort(string(portRangeProto))
155152
portInt, _ := strconv.ParseUint(port, 10, 16)
156153
proto = strings.ToLower(proto)

vendor.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/docker/cli-docs-tool v0.10.0
1818
github.com/docker/distribution v2.8.3+incompatible
1919
github.com/docker/docker-credential-helpers v0.9.3
20-
github.com/docker/go-connections v0.5.0
20+
github.com/docker/go-connections v0.6.0
2121
github.com/docker/go-units v0.5.0
2222
github.com/fvbommel/sortorder v1.1.0
2323
github.com/go-jose/go-jose/v4 v4.0.5

vendor.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj
6262
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
6363
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
6464
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
65-
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
66-
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
65+
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
66+
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
6767
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
6868
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
6969
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=

vendor/github.com/docker/go-connections/nat/nat.go

Lines changed: 73 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/go-connections/nat/parse.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/go-connections/sockets/README.md

Whitespace-only changes.

vendor/github.com/docker/go-connections/sockets/proxy.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/go-connections/sockets/sockets.go

Lines changed: 30 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)