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 4ded4d4e09 - Show all commits

View File

@@ -11,6 +11,10 @@ func Parse(profiles []string, dockerComposeFile ...string) (*types.Project, erro
cli.DefaultOverrideFileNames = append(cli.DefaultOverrideFileNames, "compose.katenary.yaml") cli.DefaultOverrideFileNames = append(cli.DefaultOverrideFileNames, "compose.katenary.yaml")
if len(dockerComposeFile) == 0 {
cli.DefaultOverrideFileNames = append(cli.DefaultOverrideFileNames, dockerComposeFile...)
}
options, err := cli.NewProjectOptions(nil, options, err := cli.NewProjectOptions(nil,
cli.WithProfiles(profiles), cli.WithProfiles(profiles),
cli.WithDefaultConfigPath, cli.WithDefaultConfigPath,