From 357dcb3804611579e7b6a9c0ca3fcdcff3d6deae Mon Sep 17 00:00:00 2001 From: MikaelUrankar Date: Sun, 16 Feb 2020 19:21:19 +0100 Subject: [PATCH 1/4] Add support for freebsd/arm64 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b96e5af..1a40852 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/wagoodman/keybinding v0.0.0-20181213133715-6a824da6df05 golang.org/x/crypto v0.0.0-20190907121410-71b5226ff739 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 - golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03 // indirect + golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 // indirect golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect google.golang.org/grpc v1.21.1 // indirect diff --git a/go.sum b/go.sum index 5186a53..8573edc 100644 --- a/go.sum +++ b/go.sum @@ -241,6 +241,8 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03 h1:b3JiLYVaG9kHjTcOQIoUh978YMCO7oVTQQBLudU47zY= golang.org/x/sys v0.0.0-20190907184412-d223b2b6db03/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 h1:sfkvUWPNGwSV+8/fNqctR5lS2AqCSqYwXdrjCxp/dXo= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= From aea85a1f404ceb00a0275c20b505348927dcf9d4 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 22 Feb 2020 06:50:13 +0300 Subject: [PATCH 2/4] Allow setting `source` in config file (fixes #267) --- cmd/analyze.go | 9 +++++---- cmd/root.go | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/analyze.go b/cmd/analyze.go index 0a59442..e6d7e8c 100644 --- a/cmd/analyze.go +++ b/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") - if err != nil { - fmt.Printf("unable to determine image source: %v\n", err) + sourceStr := viper.GetString("source") + sourceType = dive.ParseImageSource(sourceStr) + if sourceType == dive.SourceUnknown { + fmt.Printf("unable to determine image source: %v\n", sourceStr) os.Exit(1) } - sourceType = dive.ParseImageSource(sourceStr) imageStr = userImage } diff --git a/cmd/root.go b/cmd/root.go index cdbc60f..3ce286a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -97,6 +97,8 @@ func initConfig() { viper.SetDefault("container-engine", "docker") + viper.BindPFlag("source", rootCmd.PersistentFlags().Lookup("source")) + viper.SetEnvPrefix("DIVE") // replace all - with _ when looking for matching environment variables viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_")) From e15a2aa0d53a632c54329f1817d91871ec90d573 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 22 Feb 2020 07:10:26 +0300 Subject: [PATCH 3/4] Make `errcheck` happy --- cmd/root.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 3ce286a..707c556 100644 --- a/cmd/root.go +++ b/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,7 +99,11 @@ func initConfig() { viper.SetDefault("container-engine", "docker") - viper.BindPFlag("source", rootCmd.PersistentFlags().Lookup("source")) + 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 @@ -112,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 != "" { From 4291fd0cfc207ddcb75c41dbaeb12ab67fb6405b Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 22 Feb 2020 07:22:18 +0300 Subject: [PATCH 4/4] Add description to RPM packages (fixes #280) --- .goreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yml b/.goreleaser.yml index 7e22289..a76f758 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -30,6 +30,7 @@ nfpms: - license: MIT maintainer: Alex Goodman homepage: https://github.com/wagoodman/dive/ + description: "A tool for exploring each layer in a docker image" formats: - rpm - deb