bake: reset no-cache and pull if not set

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2020-04-30 13:01:45 -07:00
parent c4d07f67e3
commit 18095ee87b
2 changed files with 15 additions and 39 deletions

View File

@ -106,15 +106,20 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
Use: "bake [OPTIONS] [TARGET...]",
Aliases: []string{"f"},
Short: "Build from a file",
RunE: func(cmd *cobra.Command, args []string) error {
// reset to nil to avoid override is unset
if !cmd.Flags().Lookup("no-cache").Changed {
options.noCache = nil
}
if !cmd.Flags().Lookup("pull").Changed {
options.pull = nil
}
return runBake(dockerCli, args, options)
},
}
flags := cmd.Flags()
cmd.RunE = func(cmd *cobra.Command, args []string) error {
handleUnsetFlags(flags, &options)
return runBake(dockerCli, args, options)
}
flags.StringArrayVarP(&options.files, "file", "f", []string{}, "Build definition file")
flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
flags.StringArrayVar(&options.overrides, "set", nil, "Override target value (eg: targetpattern.key=value)")