Skip to content

Commit 191873b

Browse files
committed
bump compose verstion to v2.34.0
Signed-off-by: Guillaume Lours <[email protected]>
1 parent 00fdcd3 commit 191873b

33 files changed

+634
-163
lines changed

bake/compose.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func validateComposeFile(dt []byte, fn string) (bool, error) {
214214
}
215215

216216
func validateCompose(dt []byte, envs map[string]string) error {
217-
_, err := loader.Load(composetypes.ConfigDetails{
217+
_, err := loader.LoadWithContext(context.Background(), composetypes.ConfigDetails{
218218
ConfigFiles: []composetypes.ConfigFile{
219219
{
220220
Content: dt,

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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.3
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

+4-2
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=

vendor/github.com/compose-spec/compose-go/v2/cli/options.go

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/dotenv/format.go

+16-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/dotenv/godotenv.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/dotenv/parser.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/graph/traversal.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/extends.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/interpolate.go

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/loader.go

+10-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/omitEmpty.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/paths.go

-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/loader/validate.go

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/paths/windows_path.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/compose-spec/compose-go/v2/schema/compose-spec.json

+8-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)