Update docker compose to 2.2.0

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/alessio/shellescape v1.4.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/bmatcuk/doublestar/v4 v4.6.0
-	github.com/compose-spec/compose-go v1.20.2
+	github.com/compose-spec/compose-go/v2 v2.2.0
 	github.com/creack/pty v1.1.21
 	github.com/docker/cli v27.1.1+incompatible
 	github.com/docker/docker v25.0.5+incompatible
@@ -115,6 +115,7 @@ require (
 	github.com/go-openapi/jsonreference v0.20.4 // indirect
 	github.com/go-openapi/swag v0.22.7 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/cel-go v0.17.8 // indirect

go.sum

@@ -203,6 +203,8 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/compose-spec/compose-go v1.20.2 h1:u/yfZHn4EaHGdidrZycWpxXgFffjYULlTbRfJ51ykjQ=
 github.com/compose-spec/compose-go v1.20.2/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM=
+github.com/compose-spec/compose-go/v2 v2.2.0 h1:VsQosGhuO+H9wh5laiIiAe4TVd73kQ5NWwmNrdm0HRA=
+github.com/compose-spec/compose-go/v2 v2.2.0/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -460,6 +462,8 @@ github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmrid
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc=
+github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=

pkg/compose/helper.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/blang/semver"
-	composecli "github.com/compose-spec/compose-go/cli"
-	composetypes "github.com/compose-spec/compose-go/types"
+	composecli "github.com/compose-spec/compose-go/v2/cli"
+	composetypes "github.com/compose-spec/compose-go/v2/types"
 	"github.com/loft-sh/devpod/pkg/devcontainer/config"
 	"github.com/loft-sh/devpod/pkg/docker"
 	"github.com/pkg/errors"
@@ -24,7 +24,7 @@ const (
 	ServiceLabel         = "com.docker.compose.service"
 )
 
-func LoadDockerComposeProject(paths []string, envFiles []string) (*composetypes.Project, error) {
+func LoadDockerComposeProject(ctx context.Context, paths []string, envFiles []string) (*composetypes.Project, error) {
 	projectOptions, err := composecli.NewProjectOptions(
 		paths,
 		composecli.WithOsEnv,
@@ -36,7 +36,7 @@ func LoadDockerComposeProject(paths []string, envFiles []string) (*composetypes.
 		return nil, err
 	}
 
-	project, err := composecli.ProjectFromOptions(projectOptions)
+	project, err := composecli.ProjectFromOptions(ctx, projectOptions)
 	if err != nil {
 		return nil, err
 	}

pkg/devcontainer/build.go

@@ -54,7 +54,7 @@ func (r *runner) build(
 		}
 
 		r.Log.Debugf("Loading docker compose project %+v", composeFiles)
-		project, err := compose.LoadDockerComposeProject(composeFiles, envFiles)
+		project, err := compose.LoadDockerComposeProject(ctx, composeFiles, envFiles)
 		if err != nil {
 			return nil, errors.Wrap(err, "load docker compose project")
 		}

pkg/devcontainer/compose.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	composetypes "github.com/compose-spec/compose-go/types"
+	composetypes "github.com/compose-spec/compose-go/v2/types"
 	"github.com/joho/godotenv"
 	"github.com/loft-sh/devpod/pkg/compose"
 	"github.com/loft-sh/devpod/pkg/devcontainer/config"
@@ -128,7 +128,7 @@ func (r *runner) runDockerCompose(
 	}
 
 	r.Log.Debugf("Loading docker compose project %+v", composeFiles)
-	project, err := compose.LoadDockerComposeProject(composeFiles, envFiles)
+	project, err := compose.LoadDockerComposeProject(ctx, composeFiles, envFiles)
 	if err != nil {
 		return nil, errors.Wrap(err, "load docker compose project")
 	}
@@ -570,8 +570,8 @@ func (r *runner) extendedDockerComposeBuild(composeService *composetypes.Service
 	}
 
 	project := &composetypes.Project{}
-	project.Services = composetypes.Services{
-		*service,
+	project.Services = map[string]composetypes.ServiceConfig{
+		service.Name: *service,
 	}
 
 	dockerComposeFolder := getDockerComposeFolder(r.WorkspaceConfig.Origin)
@@ -736,19 +736,17 @@ while sleep 1 & wait $$!; do :; done`,
 	}
 
 	project := &composetypes.Project{}
-	project.Services = composetypes.Services{
-		*overrideService,
+	project.Services = map[string]composetypes.ServiceConfig{
+		overrideService.Name: *overrideService,
 	}
 
 	// Configure volumes
 	var volumeMounts []composetypes.VolumeConfig
 	for _, m := range mergedConfig.Mounts {
 		if m.Type == "volume" {
 			volumeMounts = append(volumeMounts, composetypes.VolumeConfig{
-				Name: m.Source,
-				External: composetypes.External{
-					External: m.External,
-				},
+				Name:     m.Source,
+				External: composetypes.External(m.External),
 			})
 		}
 	}