Merge pull request #382 from moby/llbsolver-next

Upgrade to llbsolver-next
moby · May 17, 2018 · c4bffb7 · c4bffb7
2 parents 160231c + fc888e6
commit c4bffb7
Show file tree

Hide file tree

Showing 93 changed files with 4,638 additions and 4,229 deletions.
diff --git a/api/services/control/control.pb.go b/api/services/control/control.pb.go
diff --git a/api/services/control/control.proto b/api/services/control/control.proto
@@ -56,7 +56,8 @@ message SolveRequest {
 
 message CacheOptions {
 	string ExportRef = 1;
-	string ImportRef = 2;
+	repeated string ImportRefs = 2;
+	map<string, string> ExportAttrs = 3;
 }
 
 message SolveResponse {

diff --git a/cache/blobs/blobs.go b/cache/blobs/blobs.go
@@ -25,7 +25,9 @@ type DiffPair struct {
 	Blobsum digest.Digest
 }
 
-func GetDiffPairs(ctx context.Context, contentStore content.Store, snapshotter snapshot.Snapshotter, differ diff.Comparer, ref cache.ImmutableRef) ([]DiffPair, error) {
+var ErrNoBlobs = errors.Errorf("no blobs for snapshot")
+
+func GetDiffPairs(ctx context.Context, contentStore content.Store, snapshotter snapshot.Snapshotter, differ diff.Comparer, ref cache.ImmutableRef, createBlobs bool) ([]DiffPair, error) {
 	if ref == nil {
 		return nil, nil
 	}
@@ -37,7 +39,7 @@ func GetDiffPairs(ctx context.Context, contentStore content.Store, snapshotter s
 	if parent != nil {
 		defer parent.Release(context.TODO())
 		eg.Go(func() error {
-			dp, err := GetDiffPairs(ctx, contentStore, snapshotter, differ, parent)
+			dp, err := GetDiffPairs(ctx, contentStore, snapshotter, differ, parent, createBlobs)
 			if err != nil {
 				return err
 			}
@@ -53,6 +55,8 @@ func GetDiffPairs(ctx context.Context, contentStore content.Store, snapshotter s
 			}
 			if blob != "" {
 				return DiffPair{DiffID: diffID, Blobsum: blob}, nil
+			} else if !createBlobs {
+				return nil, errors.WithStack(ErrNoBlobs)
 			}
 			// reference needs to be committed
 			parent := ref.Parent()

diff --git a/cache/cacheimport/export.go b/cache/cacheimport/export.go