docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #118 from tiborvass/bake-no-cache-pull

Browse Source 
bake: honor --no-cache and --pull
This commit is contained in:
Tõnis Tiigi 2019-07-31 10:59:59 -07:00 committed by GitHub
commit 6e32ea3418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bake/bake.go
View File

@ -248,10 +248,10 @@ func (t *Target) normalize() {
t.Outputs = removeDupes(t.Outputs) 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)) m2 := make(map[string]build.Options, len(m))
for k, v := range m { for k, v := range m {
bo, err := toBuildOpt(v) bo, err := toBuildOpt(v, noCache, pull)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -260,7 +260,7 @@ func TargetsToBuildOpt(m map[string]Target) (map[string]build.Options, error) {
return m2, nil 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 == "-" { if v := t.Context; v != nil && *v == "-" {
return nil, errors.Errorf("context from stdin not allowed in bake") 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, Tags: t.Tags,
BuildArgs: t.Args, BuildArgs: t.Args,
Labels: t.Labels, Labels: t.Labels,
NoCache: noCache,
Pull: pull,
} }
platforms, err := platformutil.Parse(t.Platforms) platforms, err := platformutil.Parse(t.Platforms)

2
commands/bake.go
View File

@ -51,7 +51,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) error {
return nil return nil
} }
bo, err := bake.TargetsToBuildOpt(m) bo, err := bake.TargetsToBuildOpt(m, in.noCache, in.pull)
if err != nil { if err != nil {
return err return err
} }