diff --git a/vendor.mod b/vendor.mod index 0a21b030550f..436fd3678f93 100644 --- a/vendor.mod +++ b/vendor.mod @@ -32,8 +32,8 @@ require ( github.com/google/uuid v1.6.0 github.com/mattn/go-runewidth v0.0.28 github.com/moby/go-archive v0.3.3 - github.com/moby/moby/api v1.55.0 - github.com/moby/moby/client v0.5.1 + github.com/moby/moby/api v1.55.1-0.20260828192505-f58d6d25b155 + github.com/moby/moby/client v0.5.2-0.20260828192505-f58d6d25b155 github.com/moby/patternmatcher v0.6.1 github.com/moby/swarmkit/v2 v2.1.2 github.com/moby/sys/atomicwriter v0.1.0 diff --git a/vendor.sum b/vendor.sum index 9332aca82a1e..669739f0e010 100644 --- a/vendor.sum +++ b/vendor.sum @@ -88,10 +88,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= 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.55.0 h1:2/sexvQyqIWS8pRSCFddBfpW2qE7vR7FCL+vN8pxwMc= -github.com/moby/moby/api v1.55.0/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs= -github.com/moby/moby/client v0.5.1 h1:tYNaJno4c0HXz12y5BiqEDy0rVTYkWzI26lGvnTMiJw= -github.com/moby/moby/client v0.5.1/go.mod h1:odLstlZ6uSnfvAgVxMpvgmb8SUdd+siH2T0GBuxVAlM= +github.com/moby/moby/api v1.55.1-0.20260828192505-f58d6d25b155 h1:+EbwgnzCbRvlo91JJwwP+zZrv8lsKM7w1AF9TE0QVgM= +github.com/moby/moby/api v1.55.1-0.20260828192505-f58d6d25b155/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs= +github.com/moby/moby/client v0.5.2-0.20260828192505-f58d6d25b155 h1:bDntrRVZvOmQc9yZ7PZiSUeKzL8UpPoEb7hm669C77o= +github.com/moby/moby/client v0.5.2-0.20260828192505-f58d6d25b155/go.mod h1:odLstlZ6uSnfvAgVxMpvgmb8SUdd+siH2T0GBuxVAlM= 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.2 h1:1WDZAI6HVYNKdCG4zlXnTAPyLsLwuhRGWlHoOUf5Z6I= diff --git a/vendor/github.com/moby/moby/api/types/image/image_inspect.go b/vendor/github.com/moby/moby/api/types/image/image_inspect.go index df09c9511bd4..90ebfd894cf1 100644 --- a/vendor/github.com/moby/moby/api/types/image/image_inspect.go +++ b/vendor/github.com/moby/moby/api/types/image/image_inspect.go @@ -72,7 +72,11 @@ type InspectResponse struct { // run on (especially for Windows). OsVersion string `json:",omitempty"` - // Size is the total size of the image including all layers it is composed of. + // Size is the total size of the selected image variant, including all layers + // it is composed of. + // + // When using the containerd image store, this includes both the image content + // that's present locally and the unpacked snapshot data. Size int64 // GraphDriver holds information about the storage driver used to store the diff --git a/vendor/github.com/moby/moby/client/client.go b/vendor/github.com/moby/moby/client/client.go index 4b4ef976a31e..3dbcacdeb9d4 100644 --- a/vendor/github.com/moby/moby/client/client.go +++ b/vendor/github.com/moby/moby/client/client.go @@ -109,7 +109,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.55" +const MaxAPIVersion = "1.56" // MinAPIVersion is the minimum API version supported by the client. API versions // below this version are not considered when performing API-version negotiation. diff --git a/vendor/github.com/moby/moby/client/pkg/jsonmessage/jsonmessage.go b/vendor/github.com/moby/moby/client/pkg/jsonmessage/jsonmessage.go index a955363d8a52..7fae6dceaaf2 100644 --- a/vendor/github.com/moby/moby/client/pkg/jsonmessage/jsonmessage.go +++ b/vendor/github.com/moby/moby/client/pkg/jsonmessage/jsonmessage.go @@ -26,7 +26,8 @@ const RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00" type DisplayOpt func(*displayOpts) error type displayOpts struct { - auxCallback func(jsonstream.Message) + auxCallback func(jsonstream.Message) + messagePrinter func(jsonstream.Message, io.Writer) error } // WithAuxCallback registers a callback that is invoked for auxiliary @@ -39,6 +40,18 @@ func WithAuxCallback(fn func(jsonstream.Message)) DisplayOpt { } } +// WithMessagePrinter sets a custom printer for non-auxiliary messages. +// If set, [DisplayStream] and [DisplayMessages] pass each message to fn instead +// of using the default terminal-aware presentation. The caller is responsible +// for handling errors reported through [jsonstream.Message.Error] and any +// terminal handling, including progress rendering and terminal-width detection. +func WithMessagePrinter(fn func(jsonstream.Message, io.Writer) error) DisplayOpt { + return func(opts *displayOpts) error { + opts.messagePrinter = fn + return nil + } +} + func RenderTUIProgress(p jsonstream.Progress, width uint16) string { var ( pbBox string @@ -232,13 +245,19 @@ func displayJSONMessages(messages iter.Seq2[jsonstream.Message, error], out io.W } } auxCallback := cfg.auxCallback + messagePrinter := cfg.messagePrinter - ids := make(map[string]uint) - var width uint16 = 200 - if isTerminal { - ws, err := term.GetWinsize(terminalFd) - if err == nil { - width = ws.Width + var ( + ids map[string]uint + width uint16 = 200 + ) + if messagePrinter == nil { + ids = make(map[string]uint) + if isTerminal { + ws, err := term.GetWinsize(terminalFd) + if err == nil { + width = ws.Width + } } } @@ -255,6 +274,13 @@ func displayJSONMessages(messages iter.Seq2[jsonstream.Message, error], out io.W continue } + if messagePrinter != nil { + if err := messagePrinter(jm, out); err != nil { + return err + } + continue + } + if jm.ID != "" && jm.Progress != nil { line, ok := ids[jm.ID] if !ok { diff --git a/vendor/modules.txt b/vendor/modules.txt index 1cebccd6194d..79fa0d2b67b3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -168,7 +168,7 @@ github.com/moby/go-archive github.com/moby/go-archive/compression github.com/moby/go-archive/internal/archiveoptions github.com/moby/go-archive/tarheader -# github.com/moby/moby/api v1.55.0 +# github.com/moby/moby/api v1.55.1-0.20260828192505-f58d6d25b155 ## explicit; go 1.24 github.com/moby/moby/api/pkg/authconfig github.com/moby/moby/api/pkg/stdcopy @@ -190,7 +190,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.5.1 +# github.com/moby/moby/client v0.5.2-0.20260828192505-f58d6d25b155 ## explicit; go 1.24 github.com/moby/moby/client github.com/moby/moby/client/internal