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

build: move solve opt out of duplicate map

Browse Source 
This was more error prone, as opposed to the approach used prior to
616fb3e55cbc85647026f6e409af17e1011a85c4.

Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2023-11-28 10:10:50 +00:00
parent cec4496d3b
commit aa0aeac297
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/build.go
View File

@ -509,10 +509,6 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
if err != nil { if err != nil {
return nil, err return nil, err
} }
driversSolveOpts := make(map[string][]*client.SolveOpt, len(drivers))
for k, dps := range drivers {
driversSolveOpts[k] = make([]*client.SolveOpt, len(dps))
}
defers := make([]func(), 0, 2) defers := make([]func(), 0, 2)
defer func() { defer func() {
@ -532,7 +528,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
if err != nil { if err != nil {
logrus.WithError(err).Warn("current commit information was not captured by the build") logrus.WithError(err).Warn("current commit information was not captured by the build")
} }
for i, np := range drivers[k] { for _, np := range drivers[k] {
if np.Node().Driver.IsMobyDriver() { if np.Node().Driver.IsMobyDriver() {
hasMobyDriver = true hasMobyDriver = true
} }
@ -552,7 +548,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
so.FrontendAttrs[k] = v so.FrontendAttrs[k] = v
} }
defers = append(defers, release) defers = append(defers, release)
driversSolveOpts[k][i] = so np.SolveOpt = so
} }
for _, at := range opt.Session { for _, at := range opt.Session {
if s, ok := at.(interface { if s, ok := at.(interface {
@ -566,8 +562,8 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
// validate for multi-node push // validate for multi-node push
if hasMobyDriver && multiDriver { if hasMobyDriver && multiDriver {
for _, so := range driversSolveOpts[k] { for _, np := range drivers[k] {
for _, e := range so.Exports { for _, e := range np.SolveOpt.Exports {
if e.Type == "moby" { if e.Type == "moby" {
if ok, _ := strconv.ParseBool(e.Attrs["push"]); ok { if ok, _ := strconv.ParseBool(e.Attrs["push"]); ok {
return nil, errors.Errorf("multi-node push can't currently be performed with the docker driver, please switch to a different driver") return nil, errors.Errorf("multi-node push can't currently be performed with the docker driver, please switch to a different driver")
@ -582,7 +578,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
for name := range opt { for name := range opt {
dps := drivers[name] dps := drivers[name]
for i, dp := range dps { for i, dp := range dps {
so := driversSolveOpts[name][i] so := drivers[name][i].SolveOpt
for k, v := range so.FrontendAttrs { for k, v := range so.FrontendAttrs {
if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") { if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") {
k2 := strings.TrimPrefix(v, "target:") k2 := strings.TrimPrefix(v, "target:")
@ -610,7 +606,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
results := waitmap.New() results := waitmap.New()
multiTarget := len(opt) > 1 multiTarget := len(opt) > 1
childTargets := calculateChildTargets(drivers, driversSolveOpts, opt) childTargets := calculateChildTargets(drivers, opt)
for k, opt := range opt { for k, opt := range opt {
err := func(k string) error { err := func(k string) error {
@ -634,7 +630,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
for i, dp := range dps { for i, dp := range dps {
i, dp := i, dp i, dp := i, dp
node := dp.Node() node := dp.Node()
so := driversSolveOpts[k][i] so := drivers[k][i].SolveOpt
if multiDriver { if multiDriver {
for i, e := range so.Exports { for i, e := range so.Exports {
switch e.Type { switch e.Type {
@ -1303,12 +1299,12 @@ func resultKey(index int, name string) string {
} }
// calculateChildTargets returns all the targets that depend on current target for reverse index // calculateChildTargets returns all the targets that depend on current target for reverse index
func calculateChildTargets(drivers map[string][]*resolvedNode, driversSolveOpts map[string][]*client.SolveOpt, opt map[string]Options) map[string][]string { func calculateChildTargets(drivers map[string][]*resolvedNode, opt map[string]Options) map[string][]string {
out := make(map[string][]string) out := make(map[string][]string)
for name := range opt { for name := range opt {
dps := drivers[name] dps := drivers[name]
for i, dp := range dps { for i, dp := range dps {
so := driversSolveOpts[name][i] so := drivers[name][i].SolveOpt
for k, v := range so.FrontendAttrs { for k, v := range so.FrontendAttrs {
if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") { if strings.HasPrefix(k, "context:") && strings.HasPrefix(v, "target:") {
target := resultKey(dp.driverIndex, strings.TrimPrefix(v, "target:")) target := resultKey(dp.driverIndex, strings.TrimPrefix(v, "target:"))

2
build/driver.go
View File

@ -19,6 +19,8 @@ import (
) )
type resolvedNode struct { type resolvedNode struct {
SolveOpt *client.SolveOpt
resolver *nodeResolver resolver *nodeResolver
driverIndex int driverIndex int
platforms []specs.Platform platforms []specs.Platform