Merge pull request #283 from abitrolly/sourceconfig

Allow setting `source` in config file (fixes #267)

cmd/analyze.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	"github.com/wagoodman/dive/runtime"
 )
 
@@ -45,13 +46,13 @@ func doAnalyzeCmd(cmd *cobra.Command, args []string) {
 	sourceType, imageStr = dive.DeriveImageSource(userImage)
 
 	if sourceType == dive.SourceUnknown {
-		sourceStr, err := cmd.PersistentFlags().GetString("source")
+		sourceStr := viper.GetString("source")
-		if err != nil {
+		sourceType = dive.ParseImageSource(sourceStr)
-			fmt.Printf("unable to determine image source: %v\n", err)
+		if sourceType == dive.SourceUnknown {
+			fmt.Printf("unable to determine image source: %v\n", sourceStr)
 			os.Exit(1)
 		}
 
-		sourceType = dive.ParseImageSource(sourceStr)
 		imageStr = userImage
 	}
 

cmd/root.go

@@ -66,6 +66,8 @@ func initCli() {
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
+	var err error
+
 	viper.SetDefault("log.level", log.InfoLevel.String())
 	viper.SetDefault("log.path", "./dive.log")
 	viper.SetDefault("log.enabled", false)
@@ -97,6 +99,12 @@ func initConfig() {
 
 	viper.SetDefault("container-engine", "docker")
 
+	err = viper.BindPFlag("source", rootCmd.PersistentFlags().Lookup("source"))
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
 	viper.SetEnvPrefix("DIVE")
 	// replace all - with _ when looking for matching environment variables
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
@@ -110,7 +118,7 @@ func initConfig() {
 	} else {
 		viper.SetConfigFile(cfgFile)
 	}
-	err := viper.ReadInConfig()
+	err = viper.ReadInConfig()
 	if err == nil {
 		fmt.Println("Using config file:", viper.ConfigFileUsed())
 	} else if cfgFile != "" {