Merge pull request #169 from nkubala/user

Don't retrieve user information when retrieving homedir for cache

Author: nkubala

Gopkg.lock

@@ -43,3 +43,7 @@
 [[constraint]]
   name = "github.com/containers/image"
   revision = "abb4cd79e3427bb2b02a5930814ef2ad19983c24"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mitchellh/go-homedir"

Gopkg.toml

@@ -16,6 +16,7 @@ go_library(
         "//pkg/util:go_default_library",
         "//util:go_default_library",
         "//vendor/github.com/docker/docker/client:go_default_library",
+        "//vendor/github.com/mitchellh/go-homedir:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",

cmd/BUILD.bazel

@@ -20,7 +20,6 @@ import (
 	goflag "flag"
 	"fmt"
 	"os"
-	"os/user"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -30,6 +29,7 @@ import (
 	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
 	"github.com/GoogleCloudPlatform/container-diff/util"
 	"github.com/docker/docker/client"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -168,11 +168,11 @@ func getPrepperForImage(image string) (pkgutil.Prepper, error) {
 }
 
 func cacheDir() (string, error) {
-	user, err := user.Current()
+	dir, err := homedir.Dir()
 	if err != nil {
 		return "", err
 	}
-	rootDir := filepath.Join(user.HomeDir, ".container-diff")
+	rootDir := filepath.Join(dir, ".container-diff")
 	return filepath.Join(rootDir, "cache"), nil
 }