manually detect tar compression before attempting to unpack

Author: nkubala

pkg/util/BUILD.bazel

@@ -17,6 +17,7 @@ go_library(
     deps = [
         "//vendor/github.com/containers/image/docker:go_default_library",
         "//vendor/github.com/containers/image/docker/tarfile:go_default_library",
+        "//vendor/github.com/containers/image/pkg/compression:go_default_library",
         "//vendor/github.com/containers/image/types:go_default_library",
         "//vendor/github.com/docker/docker/client:go_default_library",
         "//vendor/github.com/docker/docker/pkg/system:go_default_library",

pkg/util/image_prep_utils.go

@@ -18,14 +18,14 @@ package util
 
 import (
 	"archive/tar"
-	"compress/gzip"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/image/pkg/compression"
 	"github.com/containers/image/types"
 	"github.com/golang/glog"
 )
@@ -87,13 +87,23 @@ func getFileSystemFromReference(ref types.ImageReference, imageName string) (str
 	for _, b := range img.LayerInfos() {
 		bi, _, err := imgSrc.GetBlob(b)
 		if err != nil {
-			glog.Errorf("Failed to pull image layer with error: %s", err)
+			glog.Errorf("Failed to pull image layer: %s", err)
 		}
-		gzf, err := gzip.NewReader(bi)
+		// try and detect layer compression
+		f, reader, err := compression.DetectCompression(bi)
 		if err != nil {
-			glog.Errorf("Failed to read layers with error: %s", err)
+			glog.Errorf("Failed to detect image compression: %s", err)
+			return "", err
 		}
-		tr := tar.NewReader(gzf)
+		if f != nil {
+			// decompress if necessary
+			reader, err = f(reader)
+			if err != nil {
+				glog.Errorf("Failed to decompress image: %s", err)
+				return "", err
+			}
+		}
+		tr := tar.NewReader(reader)
 		err = unpackTar(tr, path)
 		if err != nil {
 			glog.Errorf("Failed to untar layer with error: %s", err)
@@ -128,27 +138,8 @@ func getConfigFromReference(ref types.ImageReference, source string) (ConfigSche
 func CleanupImage(image Image) {
 	if image.FSPath != "" {
 		glog.Infof("Removing image filesystem directory %s from system", image.FSPath)
-		errMsg := remove(image.FSPath, true)
-		if errMsg != "" {
-			glog.Error(errMsg)
+		if err := os.RemoveAll(image.FSPath); err != nil {
+			glog.Error(err.Error())
 		}
 	}
 }
-
-func remove(path string, dir bool) string {
-	var errStr string
-	if path == "" {
-		return ""
-	}
-
-	var err error
-	if dir {
-		err = os.RemoveAll(path)
-	} else {
-		err = os.Remove(path)
-	}
-	if err != nil {
-		errStr = "\nUnable to remove " + path
-	}
-	return errStr
-}

test.sh

@@ -53,7 +53,7 @@ if [ ! "$(git status --porcelain)" ]; then
 	# Check gazelle if everything is up to date.
 	bazel run //:gazelle
 	if [ "$(git status --porcelain)" ]; then
-		echo "BUILD files out of date. Run `bazel run //:gazelle` to update them."
+		echo "BUILD files out of date. Run 'bazel run //:gazelle' to update them."
 		exit 1
 	fi
 fi