Skip to content

Commit 646df6d

Browse files
tonistiigitonistiigi
authored
Merge pull request #3064 from glours/bump-compose-v2.34.0
bump compose-go to v2.4.9
2 parents d46c1d8 + 212d598 commit 646df6d

43 files changed

Lines changed: 663 additions & 205 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bake/bake.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding"
66
"io"
7+
"maps"
78
"os"
89
"path"
910
"path/filepath"
@@ -1104,9 +1105,7 @@ func (t *Target) GetEvalContexts(ectx *hcl.EvalContext, block *hcl.Block, loadDe
11041105
e2 := ectx.NewChild()
11051106
e2.Variables = make(map[string]cty.Value)
11061107
if e != ectx {
1107-
for k, v := range e.Variables {
1108-
e2.Variables[k] = v
1109-
}
1108+
maps.Copy(e2.Variables, e.Variables)
11101109
}
11111110
e2.Variables[k] = v
11121111
ectxs2 = append(ectxs2, e2)

‎bake/compose.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package bake
33
import (
44
"context"
55
"fmt"
6+
"maps"
67
"os"
78
"path/filepath"
89
"slices"
@@ -91,9 +92,7 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
9192
var additionalContexts map[string]string
9293
if s.Build.AdditionalContexts != nil {
9394
additionalContexts = map[string]string{}
94-
for k, v := range s.Build.AdditionalContexts {
95-
additionalContexts[k] = v
96-
}
95+
maps.Copy(additionalContexts, s.Build.AdditionalContexts)
9796
}
9897

9998
var shmSize *string
@@ -214,7 +213,7 @@ func validateComposeFile(dt []byte, fn string) (bool, error) {
214213
}
215214

216215
func validateCompose(dt []byte, envs map[string]string) error {
217-
_, err := loader.Load(composetypes.ConfigDetails{
216+
_, err := loader.LoadWithContext(context.Background(), composetypes.ConfigDetails{
218217
ConfigFiles: []composetypes.ConfigFile{
219218
{
220219
Content: dt,

‎build/build.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"encoding/json"
99
"fmt"
1010
"io"
11+
"maps"
1112
"os"
1213
"slices"
1314
"strconv"
@@ -431,9 +432,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opts map[
431432
FrontendInputs: frontendInputs,
432433
FrontendOpt: make(map[string]string),
433434
}
434-
for k, v := range so.FrontendAttrs {
435-
req.FrontendOpt[k] = v
436-
}
435+
maps.Copy(req.FrontendOpt, so.FrontendAttrs)
437436
so.Frontend = ""
438437
so.FrontendInputs = nil
439438

‎build/git.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package build
22

33
import (
44
"context"
5+
"maps"
56
"os"
67
"path"
78
"path/filepath"
@@ -127,9 +128,7 @@ func getGitAttributes(ctx context.Context, contextPath, dockerfilePath string) (
127128
if so.FrontendAttrs == nil {
128129
so.FrontendAttrs = make(map[string]string)
129130
}
130-
for k, v := range res {
131-
so.FrontendAttrs[k] = v
132-
}
131+
maps.Copy(so.FrontendAttrs, res)
133132

134133
if !setGitInfo || root == "" {
135134
return

‎build/provenance.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/base64"
66
"encoding/json"
77
"io"
8+
"maps"
89
"strings"
910
"sync"
1011

@@ -40,9 +41,7 @@ func setRecordProvenance(ctx context.Context, c *client.Client, sr *client.Solve
4041
if err != nil {
4142
return err
4243
}
43-
for k, v := range res {
44-
sr.ExporterResponse[k] = v
45-
}
44+
maps.Copy(sr.ExporterResponse, res)
4645
return nil
4746
})
4847
}

‎commands/ls.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"maps"
78
"sort"
89
"strings"
910
"time"
@@ -409,9 +410,7 @@ func truncPlatforms(pfs []string, max int) truncatedPlatforms {
409410
left[ppf] = append(left[ppf], pf)
410411
}
411412
}
412-
for k, v := range left {
413-
res[k] = v
414-
}
413+
maps.Copy(res, left)
415414
return truncatedPlatforms{
416415
res: res,
417416
input: pfs,

‎controller/pb/cache.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package pb
22

3-
import "github.com/moby/buildkit/client"
3+
import (
4+
"maps"
5+
6+
"github.com/moby/buildkit/client"
7+
)
48

59
func CreateCaches(entries []*CacheOptionsEntry) []client.CacheOptionsEntry {
610
var outs []client.CacheOptionsEntry
@@ -12,9 +16,7 @@ func CreateCaches(entries []*CacheOptionsEntry) []client.CacheOptionsEntry {
1216
Type: entry.Type,
1317
Attrs: map[string]string{},
1418
}
15-
for k, v := range entry.Attrs {
16-
out.Attrs[k] = v
17-
}
19+
maps.Copy(out.Attrs, entry.Attrs)
1820
outs = append(outs, out)
1921
}
2022
return outs

‎controller/pb/export.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package pb
22

33
import (
44
"io"
5+
"maps"
56
"os"
67
"strconv"
78

@@ -26,9 +27,7 @@ func CreateExports(entries []*ExportEntry) ([]client.ExportEntry, []string, erro
2627
Type: entry.Type,
2728
Attrs: map[string]string{},
2829
}
29-
for k, v := range entry.Attrs {
30-
out.Attrs[k] = v
31-
}
30+
maps.Copy(out.Attrs, entry.Attrs)
3231

3332
supportFile := false
3433
supportDir := false

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/docker/buildx
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
github.com/Masterminds/semver/v3 v3.2.1
77
github.com/Microsoft/go-winio v0.6.2
88
github.com/aws/aws-sdk-go-v2/config v1.27.27
9-
github.com/compose-spec/compose-go/v2 v2.4.8
9+
github.com/compose-spec/compose-go/v2 v2.4.9
1010
github.com/containerd/console v1.0.4
1111
github.com/containerd/containerd/v2 v2.0.4
1212
github.com/containerd/continuity v0.4.5
@@ -159,6 +159,7 @@ require (
159159
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
160160
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
161161
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
162+
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
162163
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
163164
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
164165
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e
7777
github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
7878
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
7979
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
80-
github.com/compose-spec/compose-go/v2 v2.4.8 h1:7Myl8wDRl/4mRz77S+eyDJymGGEHu0diQdGSSeyq90A=
81-
github.com/compose-spec/compose-go/v2 v2.4.8/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
80+
github.com/compose-spec/compose-go/v2 v2.4.9 h1:2K4TDw+1ba2idiR6empXHKRXvWYpnvAKoNQy93/sSOs=
81+
github.com/compose-spec/compose-go/v2 v2.4.9/go.mod h1:6k5l/0TxCg0/2uLEhRVEsoBWBprS2uvZi32J7xub3lo=
8282
github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
8383
github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
8484
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
@@ -459,6 +459,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
459459
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
460460
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
461461
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
462+
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
463+
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
462464
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
463465
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
464466
github.com/zclconf/go-cty v1.4.0/go.mod h1:nHzOclRkoj++EU9ZjSrZvRG0BXIWt8c7loYc0qXAFGQ=

0 commit comments

Comments
 (0)