Merge pull request #5258 from tonistiigi/v0.15.2-picks

[v0.15] cherry-picks for v0.15.2

cache/remotecache/v1/utils.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sort"
 
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/moby/buildkit/solver"
 	"github.com/moby/buildkit/util/bklog"
 	digest "github.com/opencontainers/go-digest"
@@ -281,7 +282,9 @@ func marshalRemote(ctx context.Context, r *solver.Remote, state *marshalState) s
 	if r.Provider != nil {
 		for _, d := range r.Descriptors {
 			if _, err := r.Provider.Info(ctx, d.Digest); err != nil {
-				return ""
+				if !cerrdefs.IsNotImplemented(err) {
+					return ""
+				}
 			}
 		}
 	}

client/llb/exec.go

@@ -396,6 +396,7 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []
 			})
 		} else {
 			pm := &pb.Mount{
+				Input:     pb.Empty,
 				Dest:      s.Target,
 				MountType: pb.MountType_SECRET,
 				SecretOpt: &pb.SecretOpt{
@@ -412,6 +413,7 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []
 
 	for _, s := range e.ssh {
 		pm := &pb.Mount{
+			Input:     pb.Empty,
 			Dest:      s.Target,
 			MountType: pb.MountType_SSH,
 			SSHOpt: &pb.SSHOpt{

solver/llbsolver/ops/exec.go

@@ -285,6 +285,11 @@ type dep struct {
 func (e *ExecOp) getMountDeps() ([]dep, error) {
 	deps := make([]dep, e.numInputs)
 	for _, m := range e.op.Mounts {
+		switch m.MountType {
+		case pb.MountType_SECRET, pb.MountType_SSH, pb.MountType_TMPFS:
+			continue
+		}
+
 		if m.Input == pb.Empty {
 			continue
 		}