From 8b2171f78a86633496563f742ef16d2540e8c667 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 30 Jul 2019 19:39:01 -0700 Subject: [PATCH] bake: honor --no-cache and --pull Signed-off-by: Tibor Vass --- bake/bake.go | 8 +++++--- commands/bake.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bake/bake.go b/bake/bake.go index 4cebeab2..2e44af4f 100644 --- a/bake/bake.go +++ b/bake/bake.go @@ -248,10 +248,10 @@ func (t *Target) normalize() { t.Outputs = removeDupes(t.Outputs) } -func TargetsToBuildOpt(m map[string]Target) (map[string]build.Options, error) { +func TargetsToBuildOpt(m map[string]Target, noCache, pull bool) (map[string]build.Options, error) { m2 := make(map[string]build.Options, len(m)) for k, v := range m { - bo, err := toBuildOpt(v) + bo, err := toBuildOpt(v, noCache, pull) if err != nil { return nil, err } @@ -260,7 +260,7 @@ func TargetsToBuildOpt(m map[string]Target) (map[string]build.Options, error) { return m2, nil } -func toBuildOpt(t Target) (*build.Options, error) { +func toBuildOpt(t Target, noCache, pull bool) (*build.Options, error) { if v := t.Context; v != nil && *v == "-" { return nil, errors.Errorf("context from stdin not allowed in bake") } @@ -289,6 +289,8 @@ func toBuildOpt(t Target) (*build.Options, error) { Tags: t.Tags, BuildArgs: t.Args, Labels: t.Labels, + NoCache: noCache, + Pull: pull, } platforms, err := platformutil.Parse(t.Platforms) diff --git a/commands/bake.go b/commands/bake.go index 55aa7d7a..4e740247 100644 --- a/commands/bake.go +++ b/commands/bake.go @@ -51,7 +51,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) error { return nil } - bo, err := bake.TargetsToBuildOpt(m) + bo, err := bake.TargetsToBuildOpt(m, in.noCache, in.pull) if err != nil { return err }