public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent panic on nil image

This commit is contained in:
Sharif Elgamal 2019-08-02 13:25:20 -07:00
parent 6ad4cdf314
commit 8a24115b6a
No known key found for this signature in database
GPG Key ID: 23CC0225BD9FD702
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cache/cache.go vendored
View File

@ -88,7 +88,7 @@ func (rc *RegistryCache) RetrieveLayer(ck string) (v1.Image, error) {
// Layer is stale, rebuild it. // Layer is stale, rebuild it.
if expiry.Before(time.Now()) { if expiry.Before(time.Now()) {
logrus.Infof("Cache entry expired: %s", cache) logrus.Infof("Cache entry expired: %s", cache)
return nil, errors.New(fmt.Sprintf("Cache entry expired: %s", cache)) return nil, fmt.Errorf("Cache entry expired: %s", cache)
} }
// Force the manifest to be populated // Force the manifest to be populated

3
pkg/cache/warm.go vendored
View File

@ -29,6 +29,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// WarmCache populates the cache
func WarmCache(opts *config.WarmerOptions) error { func WarmCache(opts *config.WarmerOptions) error {
cacheDir := opts.CacheDir cacheDir := opts.CacheDir
images := opts.Images images := opts.Images
@ -41,7 +42,7 @@ func WarmCache(opts *config.WarmerOptions) error {
return errors.Wrap(err, fmt.Sprintf("Failed to verify image name: %s", image)) return errors.Wrap(err, fmt.Sprintf("Failed to verify image name: %s", image))
} }
img, err := remote.Image(cacheRef) img, err := remote.Image(cacheRef)
if err != nil { if err != nil || img == nil {
return errors.Wrap(err, fmt.Sprintf("Failed to retrieve image: %s", image)) return errors.Wrap(err, fmt.Sprintf("Failed to retrieve image: %s", image))
} }