Remove executor import to fix broken darwin build (moby#25)

- the github.com/moby/buildkit/session/localhost package is used by the client buildkit code, which must compile on both linux and darwin; however the session/localhost package was pulling in the executor package which is only meant to be compiled on linux and not darwin (due to it referncing linux-specific syscall consts) Signed-off-by: Alex Couture-Beil <[email protected]>
alexcb · Jan 28, 2021 · 08299de · 08299de
1 parent a4122a2
commit 08299de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/session/localhost/localhost.go b/session/localhost/localhost.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/session"
 )
 
@@ -14,7 +13,7 @@ import (
 const RunOnLocalHostMagicStr = "/run_on_localhost_271c67a1-94d9-4241-8bca-cbae334622ae"
 
 // LocalhostExec is called by buildkitd; it connects to the user's client to request the client execute a command localy.
-func LocalhostExec(ctx context.Context, c session.Caller, process executor.ProcessInfo) error {
+func LocalhostExec(ctx context.Context, c session.Caller, args []string, stdout, stderr io.Writer) error {
 	// stdout and stderr get closed in execOp.Exec()
 
 	client := NewLocalhostClient(c.Conn())
@@ -24,7 +23,7 @@ func LocalhostExec(ctx context.Context, c session.Caller, process executor.Proce
 	}
 
 	req := InputMessage{
-		Command: process.Meta.Args,
+		Command: args,
 	}
 	if err := stream.SendMsg(&req); err != nil {
 		return err
@@ -41,8 +40,8 @@ func LocalhostExec(ctx context.Context, c session.Caller, process executor.Proce
 			}
 			return err
 		}
-		process.Stdout.Write(msg.Stdout)
-		process.Stderr.Write(msg.Stderr)
+		stdout.Write(msg.Stdout)
+		stderr.Write(msg.Stderr)
 		switch msg.Status {
 		case RUNNING:
 			//ignore

diff --git a/solver/llbsolver/ops/exec.go b/solver/llbsolver/ops/exec.go
@@ -359,12 +359,7 @@ func (e *execOp) doFromLocalHack(ctx context.Context, g session.Group, meta exec
 	}
 
 	err := e.sm.Any(ctx, g, func(ctx context.Context, _ string, caller session.Caller) error {
-		err := localhost.LocalhostExec(ctx, caller, executor.ProcessInfo{
-			Meta:   meta,
-			Stdin:  nil,
-			Stdout: stdout,
-			Stderr: stderr,
-		})
+		err := localhost.LocalhostExec(ctx, caller, meta.Args, stdout, stderr)
 		if err != nil {
 			return err
 		}