Merge pull request #6045 from jedevc/solveopt-exporter-store

client: allow configuring exporter content store

Author: tonistiigi

client/client_test.go

@@ -3703,6 +3703,38 @@ func testOCIExporterContentStore(t *testing.T, sb integration.Sandbox) {
 		}, nil)
 		require.NoError(t, err)
 
+		dt, err := os.ReadFile(outTar)
+		require.NoError(t, err)
+		m, err := testutil.ReadTarToMap(dt, false)
+		require.NoError(t, err)
+
+		checkStore := func(dir string) {
+			err = filepath.Walk(dir, func(filename string, fi os.FileInfo, err error) error {
+				filename = strings.TrimPrefix(filename, dir)
+				filename = strings.Trim(filename, "/")
+				if filename == "" || filename == "ingest" {
+					return nil
+				}
+
+				if fi.IsDir() {
+					require.Contains(t, m, filename+"/")
+				} else {
+					require.Contains(t, m, filename)
+					if filename == ocispecs.ImageIndexFile {
+						// this file has a timestamp in it, so we can't compare
+						return nil
+					}
+					f, err := os.Open(path.Join(dir, filename))
+					require.NoError(t, err)
+					data, err := io.ReadAll(f)
+					require.NoError(t, err)
+					require.Equal(t, m[filename].Data, data)
+				}
+				return nil
+			})
+			require.NoError(t, err)
+		}
+
 		outDir := filepath.Join(destDir, "out.d")
 		attrs = map[string]string{
 			"tar": "false",
@@ -3720,35 +3752,28 @@ func testOCIExporterContentStore(t *testing.T, sb integration.Sandbox) {
 			},
 		}, nil)
 		require.NoError(t, err)
+		checkStore(outDir)
 
-		dt, err := os.ReadFile(outTar)
+		outStoreDir := filepath.Join(destDir, "store.d")
+		store, err := local.NewStore(outStoreDir)
 		require.NoError(t, err)
-		m, err := testutil.ReadTarToMap(dt, false)
+		attrs = map[string]string{
+			"tar": "false",
+		}
+		if exp == ExporterDocker {
+			attrs["name"] = target
+		}
+		_, err = c.Solve(sb.Context(), def, SolveOpt{
+			Exports: []ExportEntry{
+				{
+					Type:        exp,
+					Attrs:       attrs,
+					OutputStore: store,
+				},
+			},
+		}, nil)
 		require.NoError(t, err)
-
-		filepath.Walk(outDir, func(filename string, fi os.FileInfo, err error) error {
-			filename = strings.TrimPrefix(filename, outDir)
-			filename = strings.Trim(filename, "/")
-			if filename == "" || filename == "ingest" {
-				return nil
-			}
-
-			if fi.IsDir() {
-				require.Contains(t, m, filename+"/")
-			} else {
-				require.Contains(t, m, filename)
-				if filename == ocispecs.ImageIndexFile {
-					// this file has a timestamp in it, so we can't compare
-					return nil
-				}
-				f, err := os.Open(path.Join(outDir, filename))
-				require.NoError(t, err)
-				data, err := io.ReadAll(f)
-				require.NoError(t, err)
-				require.Equal(t, m[filename].Data, data)
-			}
-			return nil
-		})
+		checkStore(outDir)
 	}
 
 	checkAllReleasable(t, c, sb, true)

client/solve.go

@@ -55,10 +55,11 @@ type SolveOpt struct {
 }
 
 type ExportEntry struct {
-	Type      string
-	Attrs     map[string]string
-	Output    filesync.FileOutputFunc // for ExporterOCI and ExporterDocker
-	OutputDir string                  // for ExporterLocal
+	Type        string
+	Attrs       map[string]string
+	Output      filesync.FileOutputFunc // for ExporterOCI and ExporterDocker
+	OutputDir   string                  // for ExporterLocal
+	OutputStore content.Store
 }
 
 type CacheOptionsEntry struct {
@@ -154,26 +155,28 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
 
 		var syncTargets []filesync.FSSyncTarget
 		for exID, ex := range opt.Exports {
-			var supportFile bool
-			var supportDir bool
+			var supportFile, supportDir, supportStore bool
 			switch ex.Type {
 			case ExporterLocal:
 				supportDir = true
 			case ExporterTar:
 				supportFile = true
 			case ExporterOCI, ExporterDocker:
-				supportDir = ex.OutputDir != ""
 				supportFile = ex.Output != nil
-			}
-			if supportFile && supportDir {
-				return nil, errors.Errorf("both file and directory output is not supported by %s exporter", ex.Type)
+				supportStore = ex.OutputStore != nil || ex.OutputDir != ""
+				if supportFile && supportStore {
+					return nil, errors.Errorf("both file and store output is not supported by %s exporter", ex.Type)
+				}
 			}
 			if !supportFile && ex.Output != nil {
 				return nil, errors.Errorf("output file writer is not supported by %s exporter", ex.Type)
 			}
-			if !supportDir && ex.OutputDir != "" {
+			if !supportDir && !supportStore && ex.OutputDir != "" {
 				return nil, errors.Errorf("output directory is not supported by %s exporter", ex.Type)
 			}
+			if !supportStore && ex.OutputStore != nil {
+				return nil, errors.Errorf("output store is not supported by %s exporter", ex.Type)
+			}
 			if supportFile {
 				if ex.Output == nil {
 					return nil, errors.Errorf("output file writer is required for %s exporter", ex.Type)
@@ -184,20 +187,27 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
 				if ex.OutputDir == "" {
 					return nil, errors.Errorf("output directory is required for %s exporter", ex.Type)
 				}
-				switch ex.Type {
-				case ExporterOCI, ExporterDocker:
+				syncTargets = append(syncTargets, filesync.WithFSSyncDir(exID, ex.OutputDir))
+			}
+			if supportStore {
+				store := ex.OutputStore
+				if store == nil {
 					if err := os.MkdirAll(ex.OutputDir, 0755); err != nil {
 						return nil, err
 					}
-					cs, err := contentlocal.NewStore(ex.OutputDir)
+					store, err = contentlocal.NewStore(ex.OutputDir)
 					if err != nil {
 						return nil, err
 					}
-					contentStores["export"] = cs
 					storesToUpdate = append(storesToUpdate, ex.OutputDir)
-				default:
-					syncTargets = append(syncTargets, filesync.WithFSSyncDir(exID, ex.OutputDir))
 				}
+
+				// TODO: this should be dependent on the exporter id (to allow multiple oci exporters)
+				storeName := "export"
+				if _, ok := contentStores[storeName]; ok {
+					return nil, errors.Errorf("oci store key %q already exists", storeName)
+				}
+				contentStores[storeName] = store
 			}
 		}