refactor: handle dependencies with nested directory

Author: lizardruss

pkg/devspace/compose/config_builder.go

@@ -9,10 +9,10 @@ import (
 )
 
 type ConfigBuilder interface {
-	AddDependencies(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error
+	AddDependencies(dependency composetypes.Project, service composetypes.ServiceConfig) error
 	AddDeployment(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error
 	AddDev(service composetypes.ServiceConfig) error
-	AddImage(service composetypes.ServiceConfig) error
+	AddImage(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error
 	AddSecret(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error
 	Config() *latest.Config
 	SetName(name string)

pkg/devspace/compose/dependency.go

@@ -1,20 +1,48 @@
 package compose
 
 import (
+	"path/filepath"
+
 	composetypes "github.com/compose-spec/compose-go/types"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 )
 
 func (cb *configBuilder) AddDependencies(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error {
 	for _, dependency := range service.GetDependencies() {
+		depName := formatName(dependency)
+
 		if cb.config.Dependencies == nil {
 			cb.config.Dependencies = map[string]*latest.DependencyConfig{}
 		}
 
-		depName := formatName(dependency)
+		depService, err := dockerCompose.GetService(dependency)
+		if err != nil {
+			return err
+		}
+
+		currentPath := dockerCompose.WorkingDir
+		if service.Build != nil && service.Build.Context != "" {
+			currentPath = filepath.Join(dockerCompose.WorkingDir, service.Build.Context)
+		}
+
+		dependencyPath := dockerCompose.WorkingDir
+		if depService.Build != nil && depService.Build.Context != "" {
+			dependencyPath = filepath.Join(dockerCompose.WorkingDir, depService.Build.Context)
+		}
+
+		relativePath, err := filepath.Rel(currentPath, dependencyPath)
+		if err != nil {
+			return err
+		}
+
+		fileName := ""
+		if dependencyPath == dockerCompose.WorkingDir {
+			fileName = "devspace-" + depName + ".yaml"
+		}
+
 		cb.config.Dependencies[depName] = &latest.DependencyConfig{
 			Source: &latest.SourceConfig{
-				Path: "devspace-" + depName + ".yaml",
+				Path: filepath.Join(relativePath, fileName),
 			},
 		}
 	}

pkg/devspace/compose/image.go

@@ -7,27 +7,34 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 )
 
-func (cb *configBuilder) AddImage(service composetypes.ServiceConfig) error {
+func (cb *configBuilder) AddImage(dockerCompose composetypes.Project, service composetypes.ServiceConfig) error {
 	build := service.Build
 	if build == nil {
 		cb.config.Images = nil
 		return nil
 	}
 
-	context, err := filepath.Rel(cb.workingDir, filepath.Join(cb.workingDir, build.Context))
+	currentDir := filepath.Join(dockerCompose.WorkingDir, cb.workingDir)
+	contextDir := filepath.Join(dockerCompose.WorkingDir, build.Context)
+	context, err := filepath.Rel(currentDir, contextDir)
 	if err != nil {
 		return err
 	}
+
 	context = filepath.ToSlash(context)
 	if context == "." {
 		context = ""
 	}
 
-	dockerfile, err := filepath.Rel(cb.workingDir, filepath.Join(cb.workingDir, build.Context, build.Dockerfile))
+	dockerfile, err := filepath.Rel(currentDir, filepath.Join(dockerCompose.WorkingDir, build.Context, build.Dockerfile))
 	if err != nil {
 		return err
 	}
 
+	if dockerfile == "Dockerfile" {
+		dockerfile = ""
+	}
+
 	image := &latest.Image{
 		Image:      resolveImage(service),
 		Context:    context,
@@ -51,7 +58,6 @@ func (cb *configBuilder) AddImage(service composetypes.ServiceConfig) error {
 	}
 
 	if cb.config.Images == nil {
-
 		cb.config.Images = map[string]*latest.Image{}
 	}