Skip to content

Commit

Permalink
add option to ignore image parsing errors; closes #258
Browse files Browse the repository at this point in the history
  • Loading branch information
wagoodman committed Feb 10, 2020
1 parent 4026276 commit a9c2e48
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 14 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ No configuration is necessary, however, you can create a config file and overrid
```yaml
# supported options are "docker" and "podman"
container-engine: docker

# continue with analysis even if there are errors parsing the image archive
ignore-errors: false
log:
enabled: true
path: ./dive.log
Expand Down
18 changes: 13 additions & 5 deletions cmd/analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package cmd

import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
"github.com/wagoodman/dive/dive"
"os"

Expand Down Expand Up @@ -55,11 +57,17 @@ func doAnalyzeCmd(cmd *cobra.Command, args []string) {
imageStr = userImage
}

ignoreErrors, err := cmd.PersistentFlags().GetBool("ignore-errors")
if err != nil {
logrus.Error("unable to get 'ignore-errors' option:", err)
}

runtime.Run(runtime.Options{
Ci: isCi,
Source: sourceType,
Image: imageStr,
ExportFile: exportFile,
CiConfig: ciConfig,
Ci: isCi,
Source: sourceType,
Image: imageStr,
ExportFile: exportFile,
CiConfig: ciConfig,
IgnoreErrors: viper.GetBool("ignore-errors") || ignoreErrors,
})
}
5 changes: 5 additions & 0 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func initCli() {
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.dive.yaml, ~/.config/dive/*.yaml, or $XDG_CONFIG_HOME/dive.yaml)")
rootCmd.PersistentFlags().String("source", "docker", "The container engine to fetch the image from. Allowed values: "+strings.Join(dive.ImageSources, ", "))
rootCmd.PersistentFlags().BoolP("version", "v", false, "display version number")
rootCmd.PersistentFlags().BoolP("ignore-errors", "i", false, "ignore image parsing errors and run the analysis anyway")
rootCmd.Flags().BoolVar(&isCi, "ci", false, "Skip the interactive TUI and validate against CI rules (same as env var CI=true)")
rootCmd.Flags().StringVarP(&exportFile, "json", "j", "", "Skip the interactive TUI and write the layer analysis statistics to a given file.")
rootCmd.Flags().StringVar(&ciConfigFile, "ci-config", ".dive-ci", "If CI=true in the environment, use the given yaml to drive validation rules.")
Expand All @@ -62,6 +63,9 @@ func initCli() {
}
}

if err := ciConfig.BindPFlag("ignore-errors", rootCmd.PersistentFlags().Lookup("ignore-errors")); err != nil {
log.Fatalf("Unable to bind 'ignore-errors' flag: %v", err)
}
}

// initConfig reads in config file and ENV variables if set.
Expand Down Expand Up @@ -96,6 +100,7 @@ func initConfig() {
viper.SetDefault("filetree.show-attributes", true)

viper.SetDefault("container-engine", "docker")
viper.SetDefault("ignore-errors", false)

viper.SetEnvPrefix("DIVE")
// replace all - with _ when looking for matching environment variables
Expand Down
13 changes: 7 additions & 6 deletions runtime/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (
)

type Options struct {
Ci bool
Image string
Source dive.ImageSource
ExportFile string
CiConfig *viper.Viper
BuildArgs []string
Ci bool
Image string
Source dive.ImageSource
IgnoreErrors bool
ExportFile string
CiConfig *viper.Viper
BuildArgs []string
}
6 changes: 4 additions & 2 deletions runtime/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ func run(enableUi bool, options Options, imageResolver image.Resolver, events ev
for _, err := range errors {
events.message(" " + err.Error())
}
events.exitWithError(fmt.Errorf("file tree has path errors"))
return
if !options.IgnoreErrors {
events.exitWithError(fmt.Errorf("file tree has path errors (use '--ignore-errors' to attempt to continue)"))
return
}
}

if enableUi {
Expand Down

0 comments on commit a9c2e48

Please sign in to comment.