Replace usage of LocalDirs with LocalMounts in buildctl and examples

Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>

cmd/buildctl/build.go

@@ -250,7 +250,7 @@ func buildAction(clicontext *cli.Context) error {
 
 	solveOpt := client.SolveOpt{
 		Exports: exports,
-		// LocalDirs is set later
+		// LocalMounts is set later
 		Frontend: clicontext.String("frontend"),
 		// FrontendAttrs is set later
 		// OCILayouts is set later
@@ -267,7 +267,7 @@ func buildAction(clicontext *cli.Context) error {
 		return errors.Wrap(err, "invalid opt")
 	}
 
-	solveOpt.LocalDirs, err = build.ParseLocal(clicontext.StringSlice("local"))
+	solveOpt.LocalMounts, err = build.ParseLocal(clicontext.StringSlice("local"))
 	if err != nil {
 		return errors.Wrap(err, "invalid local")
 	}

cmd/buildctl/build/local.go

@@ -1,6 +1,25 @@
 package build
 
+import (
+	"github.com/pkg/errors"
+	"github.com/tonistiigi/fsutil"
+)
+
 // ParseLocal parses --local
-func ParseLocal(locals []string) (map[string]string, error) {
-	return attrMap(locals)
+func ParseLocal(locals []string) (map[string]fsutil.FS, error) {
+	localDirs, err := attrMap(locals)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	mounts := make(map[string]fsutil.FS, len(localDirs))
+
+	for k, v := range localDirs {
+		mounts[k], err = fsutil.NewFS(v)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+	}
+
+	return mounts, nil
 }

examples/build-using-dockerfile/main.go

@@ -16,6 +16,7 @@ import (
 	"github.com/moby/buildkit/util/progress/progressui"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"github.com/tonistiigi/fsutil"
 	"github.com/urfave/cli"
 	"golang.org/x/sync/errgroup"
 )
@@ -136,9 +137,15 @@ func newSolveOpt(clicontext *cli.Context, w io.WriteCloser) (*client.SolveOpt, e
 	if file == "" {
 		file = filepath.Join(buildCtx, "Dockerfile")
 	}
-	localDirs := map[string]string{
-		"context":    buildCtx,
-		"dockerfile": filepath.Dir(file),
+
+	cxtLocalMount, err := fsutil.NewFS(buildCtx)
+	if err != nil {
+		return nil, errors.New("invalid buildCtx local mount dir")
+	}
+
+	dockerfileLocalMount, err := fsutil.NewFS(filepath.Dir(file))
+	if err != nil {
+		return nil, errors.New("invalid dockerfile local mount dir")
 	}
 
 	frontend := "dockerfile.v0" // TODO: use gateway
@@ -173,7 +180,10 @@ func newSolveOpt(clicontext *cli.Context, w io.WriteCloser) (*client.SolveOpt, e
 				},
 			},
 		},
-		LocalDirs:     localDirs,
+		LocalMounts: map[string]fsutil.FS{
+			"context":    cxtLocalMount,
+			"dockerfile": dockerfileLocalMount,
+		},
 		Frontend:      frontend,
 		FrontendAttrs: frontendAttrs,
 	}, nil