Merge pull request #16580 from jiangyaoguo/check-image-exist-after-pulled

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-16 22:53:34 -08:00
commit 138a78db1f

View File

@ -159,6 +159,14 @@ func (p dockerPuller) Pull(image string, secrets []api.Secret) error {
err := p.client.PullImage(opts, docker.AuthConfiguration{})
if err == nil {
// Sometimes PullImage failed with no error returned.
exist, ierr := p.IsImagePresent(image)
if ierr != nil {
glog.Warningf("Failed to inspect image %s: %v", image, ierr)
}
if !exist {
return fmt.Errorf("image pull failed for unknown error")
}
return nil
}