From d568bb8ced0576afe8a2444397fd4e9d743bb384 Mon Sep 17 00:00:00 2001
From: Nick Kubala <nkubala@google.com>
Date: Wed, 1 Aug 2018 12:50:16 -0700
Subject: [PATCH] update go-containerregistry

---
 .travis.yml                                                | 3 ---
 Gopkg.lock                                                 | 4 ++--
 Gopkg.toml                                                 | 2 +-
 .../google/go-containerregistry/pkg/v1/daemon/image.go     | 1 -
 .../google/go-containerregistry/pkg/v1/daemon/write.go     | 7 ++++++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a6e150989..21b2404d37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,5 @@ go:
   - 1.10.x
 go_import_path: github.com/GoogleContainerTools/kaniko
 
-before_script:
-  - export DOCKER_API_VERSION=1.37
-
 script:
   - make test
diff --git a/Gopkg.lock b/Gopkg.lock
index beb9714813..b7c59a4812 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -417,7 +417,7 @@
   revision = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"
 
 [[projects]]
-  digest = "1:f7bc7ff5f70d0dc7a31c12430a1f7bd66bd9afe6b3f0ff571d6ddbfbb692e417"
+  digest = "1:b347f4d441e737532862875ab98e47a2b631cd9d1348103e92bee722d69bf287"
   name = "github.com/google/go-containerregistry"
   packages = [
     "pkg/authn",
@@ -436,7 +436,7 @@
     "pkg/v1/v1util",
   ]
   pruneopts = "NUT"
-  revision = "697ee0b3d46eff19ed2b30f86230377061203f79"
+  revision = "5f7b0e4895413d785ff15b84d218d73e8a47866a"
 
 [[projects]]
   branch = "master"
diff --git a/Gopkg.toml b/Gopkg.toml
index 75575934a0..6659ae162a 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -49,7 +49,7 @@ required = [
 
 [[constraint]]
   name = "github.com/google/go-containerregistry"
-  revision = "697ee0b3d46eff19ed2b30f86230377061203f79"
+  revision = "5f7b0e4895413d785ff15b84d218d73e8a47866a"
 
 [[override]]
   name = "github.com/tonistiigi/fsutil"
diff --git a/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go b/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go
index 40a93abc04..e013a2258c 100644
--- a/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go
+++ b/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/image.go
@@ -79,7 +79,6 @@ var getImageSaver = func() (ImageSaver, error) {
 	}
 	cli.NegotiateAPIVersion(context.Background())
 	return cli, nil
-	// return client.NewEnvClient()
 }
 
 func saveImage(ref name.Reference) (io.ReadCloser, error) {
diff --git a/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go b/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go
index 196afa984d..df61a7de4f 100644
--- a/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go
+++ b/vendor/github.com/google/go-containerregistry/pkg/v1/daemon/write.go
@@ -36,7 +36,12 @@ type ImageLoader interface {
 
 // This is a variable so we can override in tests.
 var GetImageLoader = func() (ImageLoader, error) {
-	return client.NewEnvClient()
+	cli, err := client.NewEnvClient()
+	if err != nil {
+		return nil, err
+	}
+	cli.NegotiateAPIVersion(context.Background())
+	return cli, nil
 }
 
 // WriteOptions are used to expose optional information to guide or