kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use docker cli lib to get image id

pull/6051/head
Medya Gh 2019-12-10 19:34:12 -08:00
parent 4d9e53389a
commit 502f3b7f8f
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -16,7 +16,7 @@ require (
github.com/cheggaaa/pb/v3 v3.0.1
github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect
github.com/docker/docker v1.13.1 // indirect
github.com/docker/docker v1.13.1
github.com/docker/go-units v0.3.3
github.com/docker/machine v0.7.1-0.20190718054102-a555e4f7a8f5 // version is 0.7.1 to pin to a555e4f7a8f5
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f

8
pkg/minikube/machine/cache_images.go
View File

@ -412,20 +412,12 @@ func retrieveImage(ref name.Reference) (v1.Image, error) {
glog.Infof("retrieving image: %+v", ref)
img, err := daemon.Image(ref)
if err == nil {
<<<<<<< HEAD
glog.Infof("found %s locally: %+v", ref.Name(), img)
return img, nil
}
// reference does not exist in the local daemon
if err != nil {
glog.Infof("daemon lookup for %+v: %v", ref, err)
||||||| constructed merge base
glog.Infof("found %s locally; caching", ref.Name())
return img, err
=======
glog.Infof("found image %s locally;", ref.Name())
return img, err
>>>>>>> improve logging
}
img, err = remote.Image(ref, remote.WithAuthFromKeychain(authn.DefaultKeychain))