From f50adc24245c351090ff8a8744591f5e508c6286 Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Tue, 15 May 2018 22:21:08 +0000
Subject: [PATCH] builder: fix compiling with buildkit on windows and
 integration tests

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3a1da5c534bb71149036eb67792a4eb4f6474144
Component: engine
---
 .../engine/builder/builder-next/controller.go   |  6 +-----
 .../builder/builder-next/executor_unix.go       | 17 +++++++++++++++++
 .../builder/builder-next/executor_windows.go    | 11 +++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 components/engine/builder/builder-next/executor_unix.go
 create mode 100644 components/engine/builder/builder-next/executor_windows.go

diff --git a/components/engine/builder/builder-next/controller.go b/components/engine/builder/builder-next/controller.go
index 9116065d0c..616086804b 100644
--- a/components/engine/builder/builder-next/controller.go
+++ b/components/engine/builder/builder-next/controller.go
@@ -15,7 +15,6 @@ import (
 	"github.com/moby/buildkit/cache/metadata"
 	"github.com/moby/buildkit/cache/remotecache"
 	"github.com/moby/buildkit/control"
-	"github.com/moby/buildkit/executor/runcexecutor"
 	"github.com/moby/buildkit/exporter"
 	"github.com/moby/buildkit/frontend"
 	"github.com/moby/buildkit/frontend/dockerfile"
@@ -89,10 +88,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 		return nil, err
 	}
 
-	exec, err := runcexecutor.New(runcexecutor.Opt{
-		Root:              filepath.Join(root, "executor"),
-		CommandCandidates: []string{"docker-runc", "runc"},
-	})
+	exec, err := newExecutor(root)
 	if err != nil {
 		return nil, err
 	}
diff --git a/components/engine/builder/builder-next/executor_unix.go b/components/engine/builder/builder-next/executor_unix.go
new file mode 100644
index 0000000000..da54473dd1
--- /dev/null
+++ b/components/engine/builder/builder-next/executor_unix.go
@@ -0,0 +1,17 @@
+// +build !windows
+
+package buildkit
+
+import (
+	"path/filepath"
+
+	"github.com/moby/buildkit/executor"
+	"github.com/moby/buildkit/executor/runcexecutor"
+)
+
+func newExecutor(root string) (executor.Executor, error) {
+	return runcexecutor.New(runcexecutor.Opt{
+		Root:              filepath.Join(root, "executor"),
+		CommandCandidates: []string{"docker-runc", "runc"},
+	})
+}
diff --git a/components/engine/builder/builder-next/executor_windows.go b/components/engine/builder/builder-next/executor_windows.go
new file mode 100644
index 0000000000..5071f6b1a4
--- /dev/null
+++ b/components/engine/builder/builder-next/executor_windows.go
@@ -0,0 +1,11 @@
+package buildkit
+
+import (
+	"errors"
+
+	"github.com/moby/buildkit/executor"
+)
+
+func newExecutor(_ string) (executor.Executor, error) {
+	return nil, errors.New("buildkit executor not implemented for windows")
+}