mirror of https://github.com/docker/buildx.git
Merge pull request #3168 from tonistiigi/bake-call-empty
bake: fix nil deference on empty call definition
This commit is contained in:
commit
7e960152a1
|
@ -261,15 +261,20 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, opt := range bo {
|
for k, opt := range bo {
|
||||||
if opt.CallFunc != nil {
|
if opt.CallFunc != nil {
|
||||||
cf, err := buildflags.ParseCallFunc(opt.CallFunc.Name)
|
cf, err := buildflags.ParseCallFunc(opt.CallFunc.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if cf == nil {
|
||||||
|
opt.CallFunc = nil
|
||||||
|
bo[k] = opt
|
||||||
|
} else {
|
||||||
opt.CallFunc.Name = cf.Name
|
opt.CallFunc.Name = cf.Name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
exp, err := ent.Validate(bo)
|
exp, err := ent.Validate(bo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue