docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-05 02:57:41 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: reset no-cache and pull if not set

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
commands/bake.go
View File

@ -106,15 +106,20 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
Use: "bake [OPTIONS] [TARGET...]", Use: "bake [OPTIONS] [TARGET...]",
Aliases: []string{"f"}, Aliases: []string{"f"},
Short: "Build from a file", 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() 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.StringArrayVarP(&options.files, "file", "f", []string{}, "Build definition file")
flags.BoolVar(&options.printOnly, "print", false, "Print the options without building") flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
flags.StringArrayVar(&options.overrides, "set", nil, "Override target value (eg: targetpattern.key=value)") flags.StringArrayVar(&options.overrides, "set", nil, "Override target value (eg: targetpattern.key=value)")

39
commands/build.go
View File

@ -70,18 +70,6 @@ type commonOptions struct {
exportLoad bool exportLoad bool
} }
func (o *commonOptions) Unset(s string) error {
switch s {
case "pull":
o.noCache = nil
case "no-cache":
o.pull = nil
default:
return errors.Errorf("cannot unset flag %q", s)
}
return nil
}
func runBuild(dockerCli command.Cli, in buildOptions) error { func runBuild(dockerCli command.Cli, in buildOptions) error {
if in.squash { if in.squash {
return errors.Errorf("squash currently not implemented") return errors.Errorf("squash currently not implemented")
@ -220,21 +208,6 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, opts map[string]bu
return err return err
} }
type unsetter interface {
Unset(flagName string) error
}
func handleUnsetFlags(flags *pflag.FlagSet, options unsetter) error {
for _, name := range []string{"pull", "no-cache"} {
if !flags.Lookup(name).Changed {
if err := options.Unset(name); err != nil {
return err
}
}
}
return nil
}
func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command { func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
var options buildOptions var options buildOptions
@ -243,17 +216,15 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
Aliases: []string{"b"}, Aliases: []string{"b"},
Short: "Start a build", Short: "Start a build",
Args: cli.ExactArgs(1), Args: cli.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
options.contextPath = args[0]
options.builder = rootOpts.builder
return runBuild(dockerCli, options)
},
} }
flags := cmd.Flags() flags := cmd.Flags()
cmd.RunE = func(cmd *cobra.Command, args []string) error {
options.contextPath = args[0]
options.builder = rootOpts.builder
handleUnsetFlags(flags, &options)
return runBuild(dockerCli, options)
}
flags.BoolVar(&options.exportPush, "push", false, "Shorthand for --output=type=registry") flags.BoolVar(&options.exportPush, "push", false, "Shorthand for --output=type=registry")
flags.BoolVar(&options.exportLoad, "load", false, "Shorthand for --output=type=docker") flags.BoolVar(&options.exportLoad, "load", false, "Shorthand for --output=type=docker")