publicWagsHome/buildx
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: refactor to avoid unneccessary nesting

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell
2023-04-19 11:42:16 +01:00
parent 1fd23933c2
commit c6a78d216c
1 changed files with 268 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/build.go
View File

@@ -792,8 +792,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
multiTarget := len(opt) > 1 multiTarget := len(opt) > 1
for k, opt := range opt { for k, opt := range opt {
err := func(k string) error { k, opt := k, opt
opt := opt
dps := m[k] dps := m[k]
multiDriver := len(m[k]) > 1 multiDriver := len(m[k]) > 1
@@ -816,17 +815,17 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
for i, e := range so.Exports { for i, e := range so.Exports {
switch e.Type { switch e.Type {
case "oci", "tar": case "oci", "tar":
return errors.Errorf("%s for multi-node builds currently not supported", e.Type) return nil, errors.Errorf("%s for multi-node builds currently not supported", e.Type)
case "image": case "image":
if pushNames == "" && e.Attrs["push"] != "" { if pushNames == "" && e.Attrs["push"] != "" {
if ok, _ := strconv.ParseBool(e.Attrs["push"]); ok { if ok, _ := strconv.ParseBool(e.Attrs["push"]); ok {
pushNames = e.Attrs["name"] pushNames = e.Attrs["name"]
if pushNames == "" { if pushNames == "" {
return errors.Errorf("tag is needed when pushing to registry") return nil, errors.Errorf("tag is needed when pushing to registry")
} }
names, err := toRepoOnly(e.Attrs["name"]) names, err := toRepoOnly(e.Attrs["name"])
if err != nil { if err != nil {
return err return nil, err
} }
if ok, _ := strconv.ParseBool(e.Attrs["registry.insecure"]); ok { if ok, _ := strconv.ParseBool(e.Attrs["registry.insecure"]); ok {
insecurePush = true insecurePush = true
@@ -1100,12 +1099,6 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
} }
return nil return nil
}) })
return nil
}(k)
if err != nil {
return nil, err
}
} }
if err := eg.Wait(); err != nil { if err := eg.Wait(); err != nil {