Merge pull request #3058 from crazy-max/buildkit-0.20.1

vendor: github.com/moby/buildkit v0.20.1
This commit is contained in:
Tõnis Tiigi
2025-03-11 09:30:42 -07:00
committed by GitHub
5 changed files with 37 additions and 36 deletions

View File

@ -26,6 +26,7 @@ import (
digest "github.com/opencontainers/go-digest"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/protobuf"
)
@ -76,27 +77,37 @@ func (rw *remoteWriter) Digest() digest.Digest {
}
func (rw *remoteWriter) Write(p []byte) (n int, err error) {
offset := rw.offset
const maxBufferSize = defaults.DefaultMaxSendMsgSize >> 1
for i := 0; i < len(p); i += maxBufferSize {
offset := rw.offset
resp, err := rw.send(&contentapi.WriteContentRequest{
Action: contentapi.WriteAction_WRITE,
Offset: offset,
Data: p,
})
if err != nil {
return 0, fmt.Errorf("failed to send write: %w", errgrpc.ToNative(err))
}
end := i + maxBufferSize
if end > len(p) {
end = len(p)
}
data := p[i:end]
n = int(resp.Offset - offset)
if n < len(p) {
err = io.ErrShortWrite
}
resp, err := rw.send(&contentapi.WriteContentRequest{
Action: contentapi.WriteAction_WRITE,
Offset: offset,
Data: data,
})
if err != nil {
return 0, fmt.Errorf("failed to send write: %w", errgrpc.ToNative(err))
}
rw.offset += int64(n)
if resp.Digest != "" {
rw.digest = digest.Digest(resp.Digest)
written := int(resp.Offset - offset)
rw.offset += int64(written)
if resp.Digest != "" {
rw.digest = digest.Digest(resp.Digest)
}
n += written
if written < len(data) {
return n, io.ErrShortWrite
}
}
return
return n, nil
}
func (rw *remoteWriter) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) (err error) {

View File

@ -23,7 +23,7 @@ var (
Package = "github.com/containerd/containerd/v2"
// Version holds the complete version number. Filled in at linking time.
Version = "2.0.2+unknown"
Version = "2.0.3+unknown"
// Revision is filled with the VCS (e.g. git) revision being used to build
// the program at linking time.