From 72f4d655ef240fa15d4d128a1526b5d4ac4964f7 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 1 Dec 2025 17:04:28 +0100 Subject: [PATCH] Bump compose go to v2.10.0 Signed-off-by: Nicolas De Loof --- cmd/compose/config.go | 2 +- go.mod | 6 +++--- go.sum | 4 ++-- pkg/bridge/convert.go | 2 +- pkg/compose/transform/replace.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/compose/config.go b/cmd/compose/config.go index c126ababd..4b5f18927 100644 --- a/cmd/compose/config.go +++ b/cmd/compose/config.go @@ -31,7 +31,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/docker/cli/cli/command" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/docker/compose/v5/cmd/formatter" "github.com/docker/compose/v5/pkg/api" diff --git a/go.mod b/go.mod index efe2a685a..ec277a0fe 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Microsoft/go-winio v0.6.2 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/buger/goterm v1.0.4 - github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f + github.com/compose-spec/compose-go/v2 v2.10.0 github.com/containerd/console v1.0.5 github.com/containerd/containerd/v2 v2.2.1-0.20251115011841-efd86f2b0bc2 github.com/containerd/errdefs v1.0.0 @@ -53,10 +53,10 @@ require ( go.opentelemetry.io/otel/trace v1.38.0 go.uber.org/goleak v1.3.0 go.uber.org/mock v0.6.0 + go.yaml.in/yaml/v4 v4.0.0-rc.3 golang.org/x/sync v0.18.0 golang.org/x/sys v0.38.0 google.golang.org/grpc v1.77.0 - gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.2 tags.cncf.io/container-device-interface v1.0.1 ) @@ -143,7 +143,6 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.opentelemetry.io/proto/otlp v1.7.1 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect - go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect golang.org/x/crypto v0.45.0 // indirect golang.org/x/net v0.47.0 // indirect golang.org/x/term v0.37.0 // indirect @@ -153,6 +152,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect google.golang.org/protobuf v1.36.10 // indirect gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) exclude ( diff --git a/go.sum b/go.sum index 058bbf4d9..ed53549de 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,8 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= -github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f h1:plzDb+0B+ws+8+xQwggr4Oy+Lsb3CeaEiPbqpBjif+Y= -github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg= +github.com/compose-spec/compose-go/v2 v2.10.0 h1:K2C5LQ3KXvkYpy5N/SG6kIYB90iiAirA9btoTh/gB0Y= +github.com/compose-spec/compose-go/v2 v2.10.0/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg= github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9vKO+HSY= github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc= diff --git a/pkg/bridge/convert.go b/pkg/bridge/convert.go index 30da007ae..aba347602 100644 --- a/pkg/bridge/convert.go +++ b/pkg/bridge/convert.go @@ -35,7 +35,7 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/go-connections/nat" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/docker/compose/v5/pkg/api" "github.com/docker/compose/v5/pkg/utils" diff --git a/pkg/compose/transform/replace.go b/pkg/compose/transform/replace.go index 8fdaf60b9..36266a066 100644 --- a/pkg/compose/transform/replace.go +++ b/pkg/compose/transform/replace.go @@ -19,7 +19,7 @@ package transform import ( "fmt" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" ) // ReplaceExtendsFile changes value for service.extends.file in input yaml stream, preserving formatting