Skip to content

Commit aea85a1

Browse files
committed
Allow setting source in config file (fixes #267)
1 parent 4026276 commit aea85a1

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

cmd/analyze.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"os"
77

88
"github.com/spf13/cobra"
9+
"github.com/spf13/viper"
910
"github.com/wagoodman/dive/runtime"
1011
)
1112

@@ -45,13 +46,13 @@ func doAnalyzeCmd(cmd *cobra.Command, args []string) {
4546
sourceType, imageStr = dive.DeriveImageSource(userImage)
4647

4748
if sourceType == dive.SourceUnknown {
48-
sourceStr, err := cmd.PersistentFlags().GetString("source")
49-
if err != nil {
50-
fmt.Printf("unable to determine image source: %v\n", err)
49+
sourceStr := viper.GetString("source")
50+
sourceType = dive.ParseImageSource(sourceStr)
51+
if sourceType == dive.SourceUnknown {
52+
fmt.Printf("unable to determine image source: %v\n", sourceStr)
5153
os.Exit(1)
5254
}
5355

54-
sourceType = dive.ParseImageSource(sourceStr)
5556
imageStr = userImage
5657
}
5758

cmd/root.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ func initConfig() {
9797

9898
viper.SetDefault("container-engine", "docker")
9999

100+
viper.BindPFlag("source", rootCmd.PersistentFlags().Lookup("source"))
101+
100102
viper.SetEnvPrefix("DIVE")
101103
// replace all - with _ when looking for matching environment variables
102104
viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))

0 commit comments

Comments
 (0)