Merge pull request #267 from nkubala/api_version

Update go-containerregistry to pick up docker API client negotiation

Author: nkubala

Gopkg.lock

@@ -7,7 +7,7 @@
   name = "github.com/fsouza/go-dockerclient"
   version = "v1.3.0"
 
-[[constraint]]
+[[override]]
   name = "github.com/docker/docker"
   branch = "master"
 
@@ -33,4 +33,4 @@
 
 [[constraint]]
   name = "github.com/google/go-containerregistry"
-  revision = "dc0a77702ddab8c3dc5630eca7c026d571c1c9b7"
+  revision = "eb57122f1bf944d0584c387c62c1a759c953684d"

Gopkg.toml

@@ -156,9 +156,7 @@ func getImageForName(imageName string) (pkgutil.Image, error) {
 
 		start := time.Now()
 		// TODO(nkubala): specify gzip.NoCompression here when functional options are supported
-		img, err = daemon.Image(ref, &daemon.ReadOptions{
-			Buffer: true,
-		})
+		img, err = daemon.Image(ref, daemon.WithBufferedOpener())
 		if err != nil {
 			return pkgutil.Image{}, errors.Wrap(err, "retrieving image from daemon")
 		}
@@ -176,7 +174,7 @@ func getImageForName(imageName string) (pkgutil.Image, error) {
 			return pkgutil.Image{}, errors.Wrap(err, "resolving auth")
 		}
 		start := time.Now()
-		img, err = remote.Image(ref, auth, http.DefaultTransport)
+		img, err = remote.Image(ref, remote.WithAuth(auth), remote.WithTransport(http.DefaultTransport))
 		if err != nil {
 			return pkgutil.Image{}, errors.Wrap(err, "retrieving remote image")
 		}

cmd/root.go

@@ -264,7 +264,7 @@ func parsePackageData(rpmOutput []string) (map[string]util.PackageInfo, error) {
 // loadImageToDaemon loads the image specified to the docker daemon.
 func loadImageToDaemon(img v1.Image) (string, error) {
 	tag := generateValidImageTag()
-	resp, err := daemon.Write(tag, img, daemon.WriteOptions{})
+	resp, err := daemon.Write(tag, img)
 	if err != nil {
 		return "", err
 	}
@@ -287,7 +287,7 @@ func generateValidImageTag() name.Tag {
 			logrus.Warn(err.Error())
 			continue
 		}
-		img, _ := daemon.Image(tag, &daemon.ReadOptions{})
+		img, _ := daemon.Image(tag)
 		if img == nil {
 			break
 		}