From dc47e73b4b9493f122a199ff93baa45b3ac48ff4 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Wed, 3 Apr 2024 21:35:04 +0200 Subject: [PATCH] Temorary fixing overrides WIP: this breaks the -c flag, but it's a start We can now use compose.katenary.yaml file as a default override. --- parser/main.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/parser/main.go b/parser/main.go index 9538e7a..b8889d1 100644 --- a/parser/main.go +++ b/parser/main.go @@ -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 {