Update buildkit w/ customizable output colors, etc.

Signed-off-by: Sean P. Kane <spkane00@gmail.com>
This commit is contained in:
Sean P. Kane
2022-07-21 13:49:21 -07:00
parent 701c548e46
commit 6583dd3aa2
10 changed files with 200 additions and 32 deletions

View File

@ -3,11 +3,25 @@ package errdefs
import (
"context"
"errors"
"strings"
"github.com/moby/buildkit/util/grpcerrors"
"google.golang.org/grpc/codes"
)
func IsCanceled(err error) bool {
return errors.Is(err, context.Canceled) || grpcerrors.Code(err) == codes.Canceled
func IsCanceled(ctx context.Context, err error) bool {
if errors.Is(err, context.Canceled) || grpcerrors.Code(err) == codes.Canceled {
return true
}
// grpc does not set cancel correctly when stream gets cancelled and then Recv is called
if err != nil && ctx.Err() == context.Canceled {
// when this error comes from containerd it is not typed at all, just concatenated string
if strings.Contains(err.Error(), "EOF") {
return true
}
if strings.Contains(err.Error(), context.Canceled.Error()) {
return true
}
}
return false
}