Merge Develop to prepare V3 #77

Merged
metal3d merged 98 commits from develop into master 2024-10-29 16:45:05 +00:00
Showing only changes of commit dc47e73b4b - Show all commits

View File

@@ -9,9 +9,7 @@ import (
// Parse compose files and return a project. The project is parsed with dotenv, osenv and profiles.
func Parse(profiles []string, dockerComposeFile ...string) (*types.Project, error) {
if len(dockerComposeFile) > 0 {
cli.DefaultFileNames = dockerComposeFile
}
cli.DefaultOverrideFileNames = append(cli.DefaultOverrideFileNames, "compose.katenary.yaml")
options, err := cli.NewProjectOptions(nil,
cli.WithProfiles(profiles),
@@ -21,6 +19,7 @@ func Parse(profiles []string, dockerComposeFile ...string) (*types.Project, erro
cli.WithNormalization(true),
cli.WithInterpolation(true),
cli.WithResolvedPaths(false),
//cli.WithResolvedPaths(true),
)
if err != nil {