Skip to content

Commit 72f4d65

Browse files
ndeloofglours
authored andcommitted
Bump compose go to v2.10.0
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent dc66e6b commit 72f4d65

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

cmd/compose/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/compose-spec/compose-go/v2/types"
3232
"github.com/docker/cli/cli/command"
3333
"github.com/spf13/cobra"
34-
"gopkg.in/yaml.v3"
34+
"go.yaml.in/yaml/v4"
3535

3636
"github.com/docker/compose/v5/cmd/formatter"
3737
"github.com/docker/compose/v5/pkg/api"

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/Microsoft/go-winio v0.6.2
99
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
1010
github.com/buger/goterm v1.0.4
11-
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f
11+
github.com/compose-spec/compose-go/v2 v2.10.0
1212
github.com/containerd/console v1.0.5
1313
github.com/containerd/containerd/v2 v2.2.1-0.20251115011841-efd86f2b0bc2
1414
github.com/containerd/errdefs v1.0.0
@@ -53,10 +53,10 @@ require (
5353
go.opentelemetry.io/otel/trace v1.38.0
5454
go.uber.org/goleak v1.3.0
5555
go.uber.org/mock v0.6.0
56+
go.yaml.in/yaml/v4 v4.0.0-rc.3
5657
golang.org/x/sync v0.18.0
5758
golang.org/x/sys v0.38.0
5859
google.golang.org/grpc v1.77.0
59-
gopkg.in/yaml.v3 v3.0.1
6060
gotest.tools/v3 v3.5.2
6161
tags.cncf.io/container-device-interface v1.0.1
6262
)
@@ -143,7 +143,6 @@ require (
143143
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
144144
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
145145
go.yaml.in/yaml/v2 v2.4.2 // indirect
146-
go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect
147146
golang.org/x/crypto v0.45.0 // indirect
148147
golang.org/x/net v0.47.0 // indirect
149148
golang.org/x/term v0.37.0 // indirect
@@ -153,6 +152,7 @@ require (
153152
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
154153
google.golang.org/protobuf v1.36.10 // indirect
155154
gopkg.in/ini.v1 v1.67.0 // indirect
155+
gopkg.in/yaml.v3 v3.0.1 // indirect
156156
)
157157

158158
exclude (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e
4646
github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
4747
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
4848
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
49-
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f h1:plzDb+0B+ws+8+xQwggr4Oy+Lsb3CeaEiPbqpBjif+Y=
50-
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg=
49+
github.com/compose-spec/compose-go/v2 v2.10.0 h1:K2C5LQ3KXvkYpy5N/SG6kIYB90iiAirA9btoTh/gB0Y=
50+
github.com/compose-spec/compose-go/v2 v2.10.0/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg=
5151
github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9vKO+HSY=
5252
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
5353
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=

pkg/bridge/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/docker/docker/api/types/network"
3636
"github.com/docker/docker/pkg/jsonmessage"
3737
"github.com/docker/go-connections/nat"
38-
"gopkg.in/yaml.v3"
38+
"go.yaml.in/yaml/v4"
3939

4040
"github.com/docker/compose/v5/pkg/api"
4141
"github.com/docker/compose/v5/pkg/utils"

pkg/compose/transform/replace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package transform
1919
import (
2020
"fmt"
2121

22-
"gopkg.in/yaml.v3"
22+
"go.yaml.in/yaml/v4"
2323
)
2424

2525
// ReplaceExtendsFile changes value for service.extends.file in input yaml stream, preserving formatting

0 commit comments

Comments
 (0)