Merge branch 'master' into keep-owner

cmd/root.go

@@ -48,6 +48,7 @@ var LogLevel string
 var format string
 
 var keepOwner bool
+const containerDiffEnvCacheDir = "CONTAINER_DIFF_CACHEDIR"
 
 type validatefxn func(args []string) error
 
@@ -240,4 +241,7 @@ func addSharedFlags(cmd *cobra.Command) {
 cmd.Flags().BoolVarP(&util.SortSize, "order", "o", false, "Set this flag to sort any file/package results by descending size. Otherwise, they will be sorted by name.")
 cmd.Flags().BoolVarP(&noCache, "no-cache", "n", false, "Set this to force retrieval of image filesystem on each run.")
 cmd.Flags().BoolVarP(&keepOwner, "keep-owner", "k", false, "Set this to keep the owner of image filesystem. Make sure you are a root user for setting this value.")
+cmd.Flags().StringVarP(&cacheDir, "cache-dir", "c", "", "cache directory base to create .container-diff (default is $HOME).")
+cmd.Flags().StringVarP(&outputFile, "output", "w", "", "output file to write to (default writes to the screen).")
+cmd.Flags().BoolVar(&forceWrite, "force", false, "force overwrite output file, if exists already.")
 }