From 4fbbf201cd7b8bb0c35fb80c5e8f65afa40a71b6 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Wed, 30 Aug 2023 09:17:57 -0400 Subject: [PATCH] build(deps): upgrade to compose-go v1.18.3 (#10947) https://github.com/compose-spec/compose-go/releases/tag/v1.18.3 Signed-off-by: Milas Bowman --- cmd/compose/compose.go | 2 +- cmd/compose/config.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 29c6f90e..e0e125fa 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -262,7 +262,7 @@ func (o *ProjectOptions) toProjectOptions(po ...cli.ProjectOptionsFn) (*cli.Proj cli.WithDotEnv, cli.WithConfigFileEnv, cli.WithDefaultConfigPath, - cli.WithProfiles(o.Profiles), + cli.WithDefaultProfiles(o.Profiles...), cli.WithName(o.ProjectName))...) } diff --git a/cmd/compose/config.go b/cmd/compose/config.go index 1383558c..df957b8d 100644 --- a/cmd/compose/config.go +++ b/cmd/compose/config.go @@ -61,7 +61,7 @@ func (o *configOptions) ToProject(ctx context.Context, services []string) (*type cli.WithResolvedPaths(!o.noResolvePath), cli.WithNormalization(!o.noNormalize), cli.WithConsistency(!o.noConsistency), - cli.WithProfiles(o.Profiles), + cli.WithDefaultProfiles(o.Profiles...), cli.WithDiscardEnvFile, cli.WithContext(ctx), cli.WithResourceLoader(git)) diff --git a/go.mod b/go.mod index 7a6c5170..96de2720 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 github.com/adrg/xdg v0.4.0 github.com/buger/goterm v1.0.4 - github.com/compose-spec/compose-go v1.18.2 + github.com/compose-spec/compose-go v1.18.3 github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.7.3 github.com/cucumber/godog v0.0.0-00010101000000-000000000000 // replaced; see replace for the actual version used diff --git a/go.sum b/go.sum index 60fb854c..58472245 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+g github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= 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 v1.18.2 h1:ZxiSvB9K4coRs39wgGeWOwfjgziOpOQT+etJ4MB3PRA= -github.com/compose-spec/compose-go v1.18.2/go.mod h1:zR2tP1+kZHi5vJz7PjpW6oMoDji/Js3GHjP+hfjf70Q= +github.com/compose-spec/compose-go v1.18.3 h1:hiwTZ8ED1l+CB2G2G4LFv/bIaoUfG2ZBalz4S7MOy5w= +github.com/compose-spec/compose-go v1.18.3/go.mod h1:zR2tP1+kZHi5vJz7PjpW6oMoDji/Js3GHjP+hfjf70Q= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=