From 6dea0f7bc9f347c7d87be555671b83336b973d2b Mon Sep 17 00:00:00 2001 From: Sebastian Choren Date: Thu, 26 Oct 2023 17:43:38 -0300 Subject: [PATCH 1/2] fix(cli): update docker compose library call --- cli/installer/docker_compose.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/installer/docker_compose.go b/cli/installer/docker_compose.go index fe7a3c052e..aac808715f 100644 --- a/cli/installer/docker_compose.go +++ b/cli/installer/docker_compose.go @@ -1,6 +1,7 @@ package installer import ( + "context" _ "embed" "fmt" "io" @@ -324,12 +325,14 @@ func getCompleteProject(ui cliUI.UI, config configuration) *types.Project { ui.Panic(err) } - project, err := loader.Load(types.ConfigDetails{ + project, err := loader.LoadWithContext(context.Background(), types.ConfigDetails{ WorkingDir: workingDir, ConfigFiles: configFiles, Environment: map[string]string{ "TRACETEST_DEV": "", }, + }, func(o *loader.Options) { + o.SetProjectName("tracetest", true) }) if err != nil { ui.Exit(fmt.Errorf("cannot parse docker-compose file: %w", err).Error()) From 51cffebbc1ad013144f02563114a31efd175e1c8 Mon Sep 17 00:00:00 2001 From: Oscar Reyes Date: Thu, 26 Oct 2023 16:14:29 -0600 Subject: [PATCH 2/2] updating project working dir --- cli/installer/docker_compose.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/installer/docker_compose.go b/cli/installer/docker_compose.go index aac808715f..9a95c850f6 100644 --- a/cli/installer/docker_compose.go +++ b/cli/installer/docker_compose.go @@ -326,7 +326,7 @@ func getCompleteProject(ui cliUI.UI, config configuration) *types.Project { } project, err := loader.LoadWithContext(context.Background(), types.ConfigDetails{ - WorkingDir: workingDir, + WorkingDir: fmt.Sprintf("%s/tracetest", workingDir), ConfigFiles: configFiles, Environment: map[string]string{ "TRACETEST_DEV": "",