Merge pull request #4779 from tonistiigi/v0.13.1-picks

[v0.13] v0.13.1 cherry-picks

cache/remotecache/v1/chains.go

@@ -122,6 +122,8 @@ type DescriptorProviderPair struct {
 	Provider   content.Provider
 }
 
+var _ withCheckDescriptor = DescriptorProviderPair{}
+
 func (p DescriptorProviderPair) ReaderAt(ctx context.Context, desc ocispecs.Descriptor) (content.ReaderAt, error) {
 	return p.Provider.ReaderAt(ctx, desc)
 }
@@ -156,6 +158,13 @@ func (p DescriptorProviderPair) SnapshotLabels(descs []ocispecs.Descriptor, inde
 	return nil
 }
 
+func (p DescriptorProviderPair) CheckDescriptor(ctx context.Context, desc ocispecs.Descriptor) error {
+	if cd, ok := p.Provider.(withCheckDescriptor); ok {
+		return cd.CheckDescriptor(ctx, desc)
+	}
+	return nil
+}
+
 // item is an implementation of a record in the cache chain. After validation,
 // normalization and marshalling into the cache config, the item results form
 // into the "layers", while the digests and the links form into the "records".

cache/remotecache/v1/utils.go

@@ -12,6 +12,11 @@ import (
 	"github.com/pkg/errors"
 )
 
+type withCheckDescriptor interface {
+	// CheckDescriptor is additional method on Provider to check if the descriptor is available without opening the reader
+	CheckDescriptor(context.Context, ocispecs.Descriptor) error
+}
+
 // sortConfig sorts the config structure to make sure it is deterministic
 func sortConfig(cc *CacheConfig) {
 	type indexedLayer struct {
@@ -279,9 +284,7 @@ func marshalRemote(ctx context.Context, r *solver.Remote, state *marshalState) s
 		return ""
 	}
 
-	if cd, ok := r.Provider.(interface {
-		CheckDescriptor(context.Context, ocispecs.Descriptor) error
-	}); ok && len(r.Descriptors) > 0 {
+	if cd, ok := r.Provider.(withCheckDescriptor); ok && len(r.Descriptors) > 0 {
 		for _, d := range r.Descriptors {
 			if cd.CheckDescriptor(ctx, d) != nil {
 				return ""

executor/oci/spec.go

@@ -2,6 +2,7 @@ package oci
 
 import (
 	"context"
+	"os"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -197,8 +198,11 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
 	}
 
 	if tracingSocket != "" {
-		if mount := getTracingSocketMount(tracingSocket); mount != nil {
-			s.Mounts = append(s.Mounts, *mount)
+		// moby/buildkit#4764
+		if _, err := os.Stat(tracingSocket); err == nil {
+			if mount := getTracingSocketMount(tracingSocket); mount != nil {
+				s.Mounts = append(s.Mounts, *mount)
+			}
 		}
 	}
 

solver/llbsolver/solver.go

@@ -125,8 +125,10 @@ func New(opt Opt) (*Solver, error) {
 
 func (s *Solver) Close() error {
 	s.solver.Close()
-	err := s.sysSampler.Close()
-	return err
+	if s.sysSampler != nil {
+		return s.sysSampler.Close()
+	}
+	return nil
 }
 
 func (s *Solver) resolver() solver.ResolveOpFunc {

util/gitutil/git_ref.go

@@ -57,7 +57,9 @@ func ParseGitRef(ref string) (*GitRef, error) {
 		err    error
 	)
 
-	if strings.HasPrefix(ref, "github.com/") {
+	if strings.HasPrefix(ref, "./") || strings.HasPrefix(ref, "../") {
+		return nil, errdefs.ErrInvalidArgument
+	} else if strings.HasPrefix(ref, "github.com/") {
 		res.IndistinguishableFromLocal = true // Deprecated
 		remote = fromURL(&url.URL{
 			Scheme: "https",

util/gitutil/git_ref_test.go

@@ -133,12 +133,21 @@ func TestParseGitRef(t *testing.T) {
 				SubDir:    "myfolder",
 			},
 		},
+		{
+			ref:      "./.git",
+			expected: nil,
+		},
+		{
+			ref:      ".git",
+			expected: nil,
+		},
 	}
 	for _, tt := range cases {
 		tt := tt
 		t.Run(tt.ref, func(t *testing.T) {
 			got, err := ParseGitRef(tt.ref)
 			if tt.expected == nil {
+				require.Nil(t, got)
 				require.Error(t, err)
 			} else {
 				require.NoError(t, err)