diff --git a/vendor.mod b/vendor.mod index afe83b46284b..96b36c484c76 100644 --- a/vendor.mod +++ b/vendor.mod @@ -28,8 +28,8 @@ require ( github.com/google/uuid v1.6.0 github.com/mattn/go-runewidth v0.0.19 github.com/moby/go-archive v0.1.0 - github.com/moby/moby/api v1.52.1-0.20251216125034-b2d84a3ef5a9 - github.com/moby/moby/client v0.2.2-0.20251216125034-b2d84a3ef5a9 + github.com/moby/moby/api v1.53.0-rc.1 + github.com/moby/moby/client v0.2.2-rc.1 github.com/moby/patternmatcher v0.6.0 github.com/moby/swarmkit/v2 v2.1.1 github.com/moby/sys/atomicwriter v0.1.0 diff --git a/vendor.sum b/vendor.sum index 7f597b87114b..fbd61a67a007 100644 --- a/vendor.sum +++ b/vendor.sum @@ -113,10 +113,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.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ= github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo= -github.com/moby/moby/api v1.52.1-0.20251216125034-b2d84a3ef5a9 h1:6a3UVDQ96IdFnpvM1TV0Ga5YWLOY30Z3UWNMjrxkKv8= -github.com/moby/moby/api v1.52.1-0.20251216125034-b2d84a3ef5a9/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= -github.com/moby/moby/client v0.2.2-0.20251216125034-b2d84a3ef5a9 h1:+1sLm7xdw1a0vXSgGw8j4hvFDwAyOiZuzWdfb9AsvqY= -github.com/moby/moby/client v0.2.2-0.20251216125034-b2d84a3ef5a9/go.mod h1:8rNHNx7Fo0vnFNjztsJuFrOjai5x2qge2VvK5gAz90Y= +github.com/moby/moby/api v1.53.0-rc.1 h1:M5SUwRbTrNy+plCTiV6gn4ZiN/Csynk0imIsUmOgHGI= +github.com/moby/moby/api v1.53.0-rc.1/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= +github.com/moby/moby/client v0.2.2-rc.1 h1:Ah2bPvdR3ZzHK+AvZeyLMyHHfEHifYlAyuWY33dLIno= +github.com/moby/moby/client v0.2.2-rc.1/go.mod h1:tbJAygdiC6iCbKkVez27Jjm9y8vdvs8y9mizjiQrNRI= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/swarmkit/v2 v2.1.1 h1:yvTJ8MMCc3f0qTA44J6R59EZ5yZawdYopkpuLk4+ICU= diff --git a/vendor/github.com/moby/moby/api/types/types.go b/vendor/github.com/moby/moby/api/types/types.go index a89befdda43f..bb5aa41a83aa 100644 --- a/vendor/github.com/moby/moby/api/types/types.go +++ b/vendor/github.com/moby/moby/api/types/types.go @@ -10,9 +10,12 @@ const ( // MediaTypeJSON is the MIME-Type for JSON objects. MediaTypeJSON = "application/json" - // MediaTypeNDJSON is the MIME-Type for Newline Delimited JSON objects streams. + // MediaTypeNDJSON is the MIME-Type for Newline Delimited JSON objects streams (https://github.com/ndjson/ndjson-spec). MediaTypeNDJSON = "application/x-ndjson" + // MediaTypeJSONLines is the MIME-Type for JSONLines objects streams (https://jsonlines.org/). + MediaTypeJSONLines = "application/jsonl" + // MediaTypeJSONSequence is the MIME-Type for JSON Text Sequences (RFC7464). MediaTypeJSONSequence = "application/json-seq" ) diff --git a/vendor/github.com/moby/moby/client/internal/json-stream.go b/vendor/github.com/moby/moby/client/internal/json-stream.go index 552978f9a183..07d07bd7e355 100644 --- a/vendor/github.com/moby/moby/client/internal/json-stream.go +++ b/vendor/github.com/moby/moby/client/internal/json-stream.go @@ -17,7 +17,7 @@ func NewJSONStreamDecoder(r io.Reader, contentType string) DecoderFn { switch contentType { case types.MediaTypeJSONSequence: return json.NewDecoder(NewRSFilterReader(r)).Decode - case types.MediaTypeJSON, types.MediaTypeNDJSON: + case types.MediaTypeJSON, types.MediaTypeNDJSON, types.MediaTypeJSONLines: fallthrough default: return json.NewDecoder(r).Decode diff --git a/vendor/github.com/moby/moby/client/system_events.go b/vendor/github.com/moby/moby/client/system_events.go index 748e01208626..b33e02aa3d7a 100644 --- a/vendor/github.com/moby/moby/client/system_events.go +++ b/vendor/github.com/moby/moby/client/system_events.go @@ -46,6 +46,7 @@ func (cli *Client) Events(ctx context.Context, options EventsListOptions) Events headers := http.Header{} headers.Add("Accept", types.MediaTypeJSONSequence) + headers.Add("Accept", types.MediaTypeJSONLines) headers.Add("Accept", types.MediaTypeNDJSON) resp, err := cli.get(ctx, "/events", query, headers) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index cf37f83df678..f7f693d3a356 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -167,7 +167,7 @@ github.com/moby/docker-image-spec/specs-go/v1 github.com/moby/go-archive github.com/moby/go-archive/compression github.com/moby/go-archive/tarheader -# github.com/moby/moby/api v1.52.1-0.20251216125034-b2d84a3ef5a9 +# github.com/moby/moby/api v1.53.0-rc.1 ## explicit; go 1.24.0 github.com/moby/moby/api/pkg/authconfig github.com/moby/moby/api/pkg/stdcopy @@ -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.2.2-0.20251216125034-b2d84a3ef5a9 +# github.com/moby/moby/client v0.2.2-rc.1 ## explicit; go 1.24.0 github.com/moby/moby/client github.com/moby/moby/client/internal