From 63445d6b70df8a69fb518a649ec8db1405504cd5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 8 Oct 2026 16:03:13 +0200 Subject: [PATCH] vendor: github.com/docker/go-connections v0.8.2 v0.8.2 - sockets: preserve configured TLS ALPN protocols - ci: add dependabot to update actions - ci: update runners to Ubuntu 26.04 - build(deps): bump actions/checkout from 6.0.2 to 7.0.1 - build(deps): bump actions/setup-go from 6.3.0 to 7.0.0 - build(deps): bump golangci/golangci-lint-action from 9.2.0 to 9.3.0 full diff: https://github.com/docker/go-connections/compare/v0.8.1...v0.8.2 Signed-off-by: Sebastiaan van Stijn --- vendor.mod | 2 +- vendor.sum | 4 ++-- .../github.com/docker/go-connections/sockets/tcp_socket.go | 6 +++++- vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/vendor.mod b/vendor.mod index 4a7f5853a80a..379731d3563f 100644 --- a/vendor.mod +++ b/vendor.mod @@ -22,7 +22,7 @@ require ( github.com/docker/cli-docs-tool v0.11.0 github.com/docker/distribution v2.8.3+incompatible github.com/docker/docker-credential-helpers v0.9.9 - github.com/docker/go-connections v0.8.1 + github.com/docker/go-connections v0.8.2 github.com/docker/go-units v0.5.0 github.com/fvbommel/sortorder v1.2.0 github.com/go-jose/go-jose/v4 v4.1.5 diff --git a/vendor.sum b/vendor.sum index bb416723a4cb..9c3ab4ab9e46 100644 --- a/vendor.sum +++ b/vendor.sum @@ -37,8 +37,8 @@ github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBi github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker-credential-helpers v0.9.9 h1:BkydjIgZ46JnDbqyM2p2fc63KMw6y+KHL3Em/2AGJ7w= github.com/docker/docker-credential-helpers v0.9.9/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c= -github.com/docker/go-connections v0.8.1 h1:JibmG5hULs5qXSr/cp/w3Pw5fZuStt4MOHMUExb29/M= -github.com/docker/go-connections v0.8.1/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q= +github.com/docker/go-connections v0.8.2 h1:9d9DEokx5W7qlr0shkFXIxEA7+TTD+llwzcykSlxMNc= +github.com/docker/go-connections v0.8.2/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q= github.com/docker/go-events v0.1.0 h1:J8VX4H7Ta8mmBhv/K/24x1kosKOrEEnYmGjcdFHTOW0= github.com/docker/go-events v0.1.0/go.mod h1:jwVwMgySJX4PiukIIRrind1wPGU8QhPa8aTEPkreUj4= github.com/docker/go-metrics v0.1.0 h1:r76KPNpstz+IvQKSWpYegSkkyzex0V3A1ZGVx6bhGlY= diff --git a/vendor/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go index 53cbb6c79e47..3224ed97dc49 100644 --- a/vendor/github.com/docker/go-connections/sockets/tcp_socket.go +++ b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go @@ -9,13 +9,17 @@ import ( // NewTCPSocket creates a TCP socket listener with the specified address and // the specified tls configuration. If TLSConfig is set, will encapsulate the // TCP listener inside a TLS one. +// If no ALPN protocols are configured, it defaults to HTTP/1.1. func NewTCPSocket(addr string, tlsConfig *tls.Config) (net.Listener, error) { l, err := net.Listen("tcp", addr) if err != nil { return nil, err } if tlsConfig != nil { - tlsConfig.NextProtos = []string{"http/1.1"} + if len(tlsConfig.NextProtos) == 0 { + tlsConfig = tlsConfig.Clone() + tlsConfig.NextProtos = []string{"http/1.1"} + } l = tls.NewListener(l, tlsConfig) } return l, nil diff --git a/vendor/modules.txt b/vendor/modules.txt index dc910389f09d..d7082c4d0452 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -71,7 +71,7 @@ github.com/docker/distribution/registry/storage/cache/memory ## explicit; go 1.21 github.com/docker/docker-credential-helpers/client github.com/docker/docker-credential-helpers/credentials -# github.com/docker/go-connections v0.8.1 +# github.com/docker/go-connections v0.8.2 ## explicit; go 1.23 github.com/docker/go-connections/nat github.com/docker/go-connections/sockets