From e863f84b15e3711d60c74136cd7042824803cf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 6 Nov 2026 02:23:19 +0100 Subject: [PATCH] vendor: github.com/moby/moby/client v0.7.0-dev (402d0a16f131) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit full diff: https://github.com/moby/moby/compare/client/v0.6.2...402d0a16f131 Signed-off-by: Paweł Gronowski --- vendor.mod | 2 +- vendor.sum | 4 ++-- vendor/github.com/moby/moby/client/client.go | 4 ++-- vendor/github.com/moby/moby/client/hijack.go | 4 +++- vendor/modules.txt | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/vendor.mod b/vendor.mod index 6b78236770..202bab8e22 100644 --- a/vendor.mod +++ b/vendor.mod @@ -34,7 +34,7 @@ require ( github.com/mattn/go-runewidth v0.0.31 github.com/moby/go-archive v0.3.3 github.com/moby/moby/api v1.56.2-0.20261106011722-402d0a16f131 - github.com/moby/moby/client v0.6.2 + github.com/moby/moby/client v0.6.3-0.20261106011722-402d0a16f131 github.com/moby/patternmatcher v0.6.1 github.com/moby/swarmkit/v2 v2.1.3 github.com/moby/sys/atomicwriter v0.1.0 diff --git a/vendor.sum b/vendor.sum index 0839364f78..11fbeeb177 100644 --- a/vendor.sum +++ b/vendor.sum @@ -90,8 +90,8 @@ github.com/moby/go-archive v0.3.3 h1:OxxR9paxsluYi+zDUEXTTaIxtkK3viymW+Ka7vRhhME github.com/moby/go-archive v0.3.3/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE= github.com/moby/moby/api v1.56.2-0.20261106011722-402d0a16f131 h1:tPz9ahj8F7AjQw62XQFP65kmoxF3rXTYSit3q06/yQc= github.com/moby/moby/api v1.56.2-0.20261106011722-402d0a16f131/go.mod h1:pRZ1QRtx6AVhdckeFYo4DUX4ASNF0SCllhyY6aj2mgg= -github.com/moby/moby/client v0.6.2 h1:ekSPlMccrZGcw6Scb8T9D39qE0mB+XupU/yS0zNw9N4= -github.com/moby/moby/client v0.6.2/go.mod h1:DGcnO7qmPJrqobx/ggQgQ/AUk+2wgVdQv7uxB0/mEsc= +github.com/moby/moby/client v0.6.3-0.20261106011722-402d0a16f131 h1:ReIO7lalQVE4BetZuIvrxScg8Rxv4Sk74XRs06ryRDU= +github.com/moby/moby/client v0.6.3-0.20261106011722-402d0a16f131/go.mod h1:dPyRteJDuLdP8to3kWmNAU/tbMwSFCE88yKHvY/nZ9k= github.com/moby/patternmatcher v0.6.1 h1:qlhtafmr6kgMIJjKJMDmMWq7WLkKIo23hsrpR3x084U= github.com/moby/patternmatcher v0.6.1/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/swarmkit/v2 v2.1.3 h1:UcwtwkIRjr75qSgUWCTIuzKUzAXlidxsiqVMnyxSF1w= diff --git a/vendor/github.com/moby/moby/client/client.go b/vendor/github.com/moby/moby/client/client.go index f407505e01..21cf1e7fad 100644 --- a/vendor/github.com/moby/moby/client/client.go +++ b/vendor/github.com/moby/moby/client/client.go @@ -108,7 +108,7 @@ const DummyHost = "api.moby.localhost" // overriding the version and disable API-version negotiation. // // This version may be lower than the version of the api library module used. -const MaxAPIVersion = "1.56" +const MaxAPIVersion = "1.57" // MinAPIVersion is the minimum API version supported by the client. API versions // below this version are not considered when performing API-version negotiation. @@ -436,7 +436,7 @@ func (cli *Client) dialer() func(context.Context) (net.Conn, error) { return dialPipeContext(ctx, cli.addr) default: if tlsConfig := cli.tlsConfig(); tlsConfig != nil { - return tls.Dial(cli.proto, cli.addr, tlsConfig) + return (&tls.Dialer{Config: tlsConfig}).DialContext(ctx, cli.proto, cli.addr) } return net.Dial(cli.proto, cli.addr) } diff --git a/vendor/github.com/moby/moby/client/hijack.go b/vendor/github.com/moby/moby/client/hijack.go index fbb0402725..70dcf28699 100644 --- a/vendor/github.com/moby/moby/client/hijack.go +++ b/vendor/github.com/moby/moby/client/hijack.go @@ -100,8 +100,10 @@ func (cli *Client) setupHijackConn(req *http.Request, proto string) (retConn net if err != nil { return nil, "", err } + // Closing the body ends the otelhttp span. A 101 response has no body, + // so this does not close the connection. + _ = resp.Body.Close() if resp.StatusCode != http.StatusSwitchingProtocols { - _ = resp.Body.Close() return nil, "", fmt.Errorf("unable to upgrade to %s, received %d", proto, resp.StatusCode) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 7ab25e8546..713d2618f7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -189,7 +189,7 @@ github.com/moby/moby/api/types/storage github.com/moby/moby/api/types/swarm github.com/moby/moby/api/types/system github.com/moby/moby/api/types/volume -# github.com/moby/moby/client v0.6.2 +# github.com/moby/moby/client v0.6.3-0.20261106011722-402d0a16f131 ## explicit; go 1.24 github.com/moby/moby/client github.com/moby/moby/client/internal