From fedd85f09da599ad8165b119dd260a89d8725603 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Mon, 11 Jan 2021 18:05:33 -0800
Subject: [PATCH] exec: correctly lookup mounts. Fixes #6

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 dagger/op.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/dagger/op.go b/dagger/op.go
index fcef9f18..11a89710 100644
--- a/dagger/op.go
+++ b/dagger/op.go
@@ -164,19 +164,21 @@ func (op *Op) Exec(ctx context.Context, fs FS, out Fillable) (FS, error) {
 		opts = append(opts, llb.AddEnv("DAGGER_CACHEBUSTER", cacheBuster))
 	}
 	// mounts
-	if err := op.v.RangeStruct(func(k string, v *Value) error {
-		mnt, err := v.Mount(k)
-		if err != nil {
-			return err
+	if mounts := op.v.Lookup("mount"); mounts.Exists() {
+		if err := mounts.RangeStruct(func(k string, v *Value) error {
+			mnt, err := v.Mount(k)
+			if err != nil {
+				return err
+			}
+			opt, err := mnt.LLB(ctx, fs.Solver())
+			if err != nil {
+				return err
+			}
+			opts = append(opts, opt)
+			return nil
+		}); err != nil {
+			return fs, err
 		}
-		opt, err := mnt.LLB(ctx, fs.Solver())
-		if err != nil {
-			return err
-		}
-		opts = append(opts, opt)
-		return nil
-	}); err != nil {
-		return fs, err
 	}
 	// --> Execute
 	return fs.Change(func(st llb.State) llb.State {