Cleanup image source directory

cmd/root.go

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

pkg/image/proxy_types.go

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

pkg/util/daemon_prepper.go

@@ -57,6 +57,7 @@ func (p *DaemonPrepper) GetFileSystem() (string, error) {
 }
 
 src, err := ref.NewImageSource(nil)
+defer src.Close()
 if err != nil {
 return "", err
 }

pkg/util/image_prep_utils.go

@@ -107,7 +107,10 @@ func getImage(p Prepper) (Image, error) {
 output.PrintToStdErr("Retrieving image %s from source %s\n", p.GetSource(), p.Name())
 imgPath, err := p.GetFileSystem()
 if err != nil {
-return Image{}, err
+// return image with FSPath so it can be cleaned up
+return Image{
+FSPath: imgPath,
+}, err
 }
 
 config, err := p.GetConfig()
@@ -136,6 +139,7 @@ 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