Merge pull request #215 from nkubala/no_docker_id

Correctly handle case where no image source is parsed

Author: nkubala

cmd/root.go

@@ -151,10 +151,10 @@ func getPrepperForImage(image string) (pkgutil.Prepper, error) {
 		return nil, err
 	}
 	src, err := ref.NewImageSource(nil)
-	defer src.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer src.Close()
 
 	if !noCache {
 		cacheDir, err := cacheDir()

pkg/image/proxy_types.go

@@ -29,10 +29,10 @@ type ProxySource struct {
 
 func NewProxySource(ref types.ImageReference) (*ProxySource, error) {
 	src, err := ref.NewImageSource(nil)
-	defer src.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer src.Close()
 	img, err := ref.NewImage(nil)
 	if err != nil {
 		return nil, err

pkg/util/daemon_prepper.go

@@ -57,10 +57,10 @@ func (p *DaemonPrepper) GetFileSystem() (string, error) {
 	}
 
 	src, err := ref.NewImageSource(nil)
-	defer src.Close()
 	if err != nil {
 		return "", err
 	}
+	defer src.Close()
 
 	sanitizedName := strings.Replace(p.Source, ":", "", -1)
 	sanitizedName = strings.Replace(sanitizedName, "/", "", -1)

pkg/util/image_prep_utils.go

@@ -152,11 +152,11 @@ func GetFileSystemFromReference(ref types.ImageReference, imgSrc types.ImageSour
 	var err error
 	if imgSrc == nil {
 		imgSrc, err = ref.NewImageSource(nil)
-		defer imgSrc.Close()
 	}
 	if err != nil {
 		return err
 	}
+	defer imgSrc.Close()
 	img, err := ref.NewImage(nil)
 	if err != nil {
 		return err