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

build: infer platform from first node if none set

Browse Source 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-11-28 11:55:47 +01:00
parent aac7a47469
commit 54032316f9
No known key found for this signature in database
GPG Key ID: ADE44D8C9D44FBE4
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build/driver.go
View File

@ -166,35 +166,34 @@ func (r *nodeResolver) resolve(ctx context.Context, ps []specs.Platform, pw prog
perfect := true perfect := true
nodeIdxs := make([]int, 0) nodeIdxs := make([]int, 0)
if len(ps) == 0 { for _, p := range ps {
idx := r.get(platforms.DefaultSpec(), matcher, additional) idx := r.get(p, matcher, additional)
if idx == -1 { if idx == -1 {
idx = 0 idx = 0
perfect = false perfect = false
} }
nodeIdxs = append(nodeIdxs, idx) nodeIdxs = append(nodeIdxs, idx)
} else {
for _, p := range ps {
idx := r.get(p, matcher, additional)
if idx == -1 {
idx = 0
perfect = false
}
nodeIdxs = append(nodeIdxs, idx)
}
} }
var nodes []*resolvedNode var nodes []*resolvedNode
for i, idx := range nodeIdxs { if len(nodeIdxs) == 0 {
node := &resolvedNode{ nodes = append(nodes, &resolvedNode{
resolver: r, resolver: r,
driverIndex: idx, driverIndex: 0,
})
} else {
for i, idx := range nodeIdxs {
node := &resolvedNode{
resolver: r,
driverIndex: idx,
}
if len(ps) > 0 {
node.platforms = []specs.Platform{ps[i]}
}
nodes = append(nodes, node)
} }
if len(ps) > 0 {
node.platforms = []specs.Platform{ps[i]}
}
nodes = append(nodes, node)
} }
nodes = recombineNodes(nodes) nodes = recombineNodes(nodes)
if _, err := r.boot(ctx, nodeIdxs, pw); err != nil { if _, err := r.boot(ctx, nodeIdxs, pw); err != nil {
return nil, false, err return nil, false, err

4
build/driver_test.go
View File

@ -217,7 +217,7 @@ func TestSelectNodePreferExact(t *testing.T) {
require.Equal(t, "bbb", res[0].Node().Builder) require.Equal(t, "bbb", res[0].Node().Builder)
} }
func TestSelectNodeCurrentPlatform(t *testing.T) { func TestSelectNodeNoPlatform(t *testing.T) {
r := makeTestResolver(map[string][]specs.Platform{ r := makeTestResolver(map[string][]specs.Platform{
"aaa": {platforms.MustParse("linux/foobar")}, "aaa": {platforms.MustParse("linux/foobar")},
"bbb": {platforms.DefaultSpec()}, "bbb": {platforms.DefaultSpec()},
@ -227,7 +227,7 @@ func TestSelectNodeCurrentPlatform(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.True(t, perfect) require.True(t, perfect)
require.Len(t, res, 1) require.Len(t, res, 1)
require.Equal(t, "bbb", res[0].Node().Builder) require.Equal(t, "aaa", res[0].Node().Builder)
require.Empty(t, res[0].platforms) require.Empty(t, res[0].platforms)
} }