Use moby/buildkit dockerfile parser

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>

Gopkg.toml

@@ -30,6 +30,18 @@
   branch = "master"
   name = "github.com/golang/glog"
 
+[[constraint]]
+  name = "github.com/moby/buildkit"
+  revision = "c7bb575343df0cbfeab8b5b28149630b8153fcc6"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  revision = "3dfb26ab3cbf961298f8ce3f94659b5fe4146ceb"
+
+[[override]]
+  name = "github.com/docker/libnetwork"
+  revision = "19279f0492417475b6bfbd0aa529f73e8f178fb5"
+
 [prune]
   non-go = true
   unused-packages = true

builder.go

@@ -13,8 +13,8 @@ import (
 
 	docker "github.com/fsouza/go-dockerclient"
 
-	"github.com/docker/docker/builder/dockerfile/command"
-	"github.com/docker/docker/builder/dockerfile/parser"
+	"github.com/moby/buildkit/frontend/dockerfile/command"
+	"github.com/moby/buildkit/frontend/dockerfile/parser"
 )
 
 // Copy defines a copy operation required on the container.

dockerclient/client.go

@@ -14,9 +14,9 @@ import (
 	"strings"
 
 	dockertypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder/dockerfile/parser"
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/golang/glog"
+	"github.com/moby/buildkit/frontend/dockerfile/parser"
 
 	"github.com/openshift/imagebuilder"
 	"github.com/openshift/imagebuilder/imageprogress"

dockerclient/conformance_test.go

@@ -20,11 +20,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/builder/dockerfile/command"
-	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/fileutils"
 	docker "github.com/fsouza/go-dockerclient"
+	"github.com/moby/buildkit/frontend/dockerfile/command"
+	"github.com/moby/buildkit/frontend/dockerfile/parser"
 
 	"github.com/openshift/imagebuilder"
 )

evaluator.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/docker/docker/builder/dockerfile/command"
-	"github.com/docker/docker/builder/dockerfile/parser"
+	"github.com/moby/buildkit/frontend/dockerfile/command"
+	"github.com/moby/buildkit/frontend/dockerfile/parser"
 )
 
 // ParseDockerfile parses the provided stream as a canonical Dockerfile