From 774bb532f1678993ce4536009b5b302f3d630aa4 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 17 Nov 2025 16:16:43 +0000 Subject: [PATCH] vendor: update buildkit to v0.26.1 Signed-off-by: Tonis Tiigi --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/moby/buildkit/util/contentutil/fetcher.go | 7 +++---- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ffe9e108f8..19e9792c63 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/miekg/dns v1.1.66 github.com/mistifyio/go-zfs/v3 v3.0.1 github.com/mitchellh/copystructure v1.2.0 - github.com/moby/buildkit v0.26.0 + github.com/moby/buildkit v0.26.1 github.com/moby/docker-image-spec v1.3.1 github.com/moby/go-archive v0.1.0 github.com/moby/ipvs v1.1.0 diff --git a/go.sum b/go.sum index a1b14735e4..fd697060c9 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/buildkit v0.26.0 h1:OSugMZoGqpVgrlpDx+OkiPRgYCIxR3XUP6wr7brDCpo= -github.com/moby/buildkit v0.26.0/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40= +github.com/moby/buildkit v0.26.1 h1:Cf/AB/8/5N+GBQnVPBW+hR2tDWoImuZ28ciqaF+mzgs= +github.com/moby/buildkit v0.26.1/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= 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= diff --git a/vendor/github.com/moby/buildkit/util/contentutil/fetcher.go b/vendor/github.com/moby/buildkit/util/contentutil/fetcher.go index bb5f12d50f..87e04691b2 100644 --- a/vendor/github.com/moby/buildkit/util/contentutil/fetcher.go +++ b/vendor/github.com/moby/buildkit/util/contentutil/fetcher.go @@ -51,10 +51,6 @@ type readerAt struct { } func (r *readerAt) ReadAt(b []byte, off int64) (int, error) { - if ra, ok := r.Reader.(io.ReaderAt); ok { - return ra.ReadAt(b, off) - } - if r.offset != off { if seeker, ok := r.Reader.(io.Seeker); ok { if _, err := seeker.Seek(off, io.SeekStart); err != nil { @@ -62,6 +58,9 @@ func (r *readerAt) ReadAt(b []byte, off int64) (int, error) { } r.offset = off } else { + if ra, ok := r.Reader.(io.ReaderAt); ok { + return ra.ReadAt(b, off) + } return 0, errors.Errorf("unsupported offset") } } diff --git a/vendor/modules.txt b/vendor/modules.txt index d665663784..619c27a922 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -838,7 +838,7 @@ github.com/mitchellh/hashstructure/v2 # github.com/mitchellh/reflectwalk v1.0.2 ## explicit github.com/mitchellh/reflectwalk -# github.com/moby/buildkit v0.26.0 +# github.com/moby/buildkit v0.26.1 ## explicit; go 1.24.3 github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/types