Merge pull request #676 from r2d4/vendor-docker

Update docker libraries

Gopkg.toml

@@ -16,20 +16,28 @@
   version = "0.0.2"
 
 [[constraint]]
-  name = "github.com/moby/moby"
-  revision = "e1f98e8ab3cb5ae5c0f452cdd81ac4a954279e62"
-
-[[override]]
   name = "github.com/docker/docker"
-  revision = "e1f98e8ab3cb5ae5c0f452cdd81ac4a954279e62"
+  revision = "162ba6016def672690ee4a1f3978368853a1e149"
 
 [[constraint]]
   name = "github.com/docker/cli"
-  revision = "b5df4f69db84a16479f16a4bc789d9b5664a47b9"
+  revision = "4cb3c70f36baeade76879694a587358be2a74854"
+
+[[override]]
+ name = "github.com/docker/go-metrics"
+ revision = "d466d4f6fd960e01820085bd7e1a24426ee7ef18"
+
+[[override]]
+  name = "github.com/xeipuuv/gojsonschema"
+  revision = "0c8571ac0ce161a5feb57375a9cdf148c98c0f70"
+
+[[constraint]]
+  name = "github.com/moby/buildkit"
+  revision = "43e758232a0ac7d50c6a11413186e16684fc1e4f"
 
 [[override]]
   name = "github.com/docker/distribution"
-  revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+  revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
 
 [[constraint]]
   name = "k8s.io/apimachinery"

pkg/skaffold/docker/auth.go

@@ -26,8 +26,8 @@ import (
 	"github.com/docker/cli/cli/config"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/docker/registry"
-	"github.com/moby/moby/pkg/homedir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

pkg/skaffold/docker/client.go

@@ -19,7 +19,6 @@ package docker
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"os/exec"
 	"path/filepath"
@@ -30,15 +29,14 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/docker/docker/api"
+	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/tlsconfig"
-	"github.com/moby/moby/client"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
 type APIClient interface {
 	client.CommonAPIClient
-	io.Closer
 }
 
 var (
@@ -74,7 +72,7 @@ func newAPIClient(kubeContext string) (APIClient, error) {
 // It will "negotiate" the highest possible API version supported by both the client
 // and the server if there is a mismatch.
 func newEnvAPIClient() (APIClient, error) {
-	cli, err := client.NewEnvClient()
+	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
 		return nil, fmt.Errorf("Error getting docker client: %s", err)
 	}

pkg/skaffold/docker/image.go

@@ -23,15 +23,15 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/progress"
+	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/docker/docker/pkg/term"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/google/go-containerregistry/pkg/v1/remote/transport"
-	"github.com/moby/moby/pkg/jsonmessage"
-	"github.com/moby/moby/pkg/streamformatter"
-	"github.com/moby/moby/pkg/term"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

pkg/skaffold/docker/parse.go

@@ -29,8 +29,8 @@ import (
 	"github.com/docker/docker/builder/dockerignore"
 	"github.com/docker/docker/pkg/fileutils"
 	"github.com/google/go-containerregistry/pkg/v1"
-	"github.com/moby/moby/builder/dockerfile/parser"
-	"github.com/moby/moby/builder/dockerfile/shell"
+	"github.com/moby/buildkit/frontend/dockerfile/parser"
+	"github.com/moby/buildkit/frontend/dockerfile/shell"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

testutil/fake_image_api.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/client"
 	"github.com/docker/docker/registry"
-	"github.com/moby/moby/client"
 )
 
 type FakeImageAPIClient struct {