github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(compose): fix path resolution for env files BE-11428 (#167)

pull/12408/head
andres-portainer 2024-11-26 22:09:58 -03:00 committed by GitHub
parent 5d2689b139
commit f2e7680bf3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/libstack/compose/composeplugin.go
View File

@ -70,20 +70,18 @@ func withComposeService(
return withCli(ctx, options, func(ctx context.Context, cli *command.DockerCli) error { return withCli(ctx, options, func(ctx context.Context, cli *command.DockerCli) error {
composeService := compose.NewComposeService(cli) composeService := compose.NewComposeService(cli)
configDetails := types.ConfigDetails{
WorkingDir: options.WorkingDir,
}
for _, p := range filePaths {
configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p})
}
env, err := parseEnvironment(options) env, err := parseEnvironment(options)
if err != nil { if err != nil {
return err return err
} }
configDetails.Environment = env configDetails := types.ConfigDetails{
Environment: env,
}
for _, p := range filePaths {
configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p})
}
if len(configDetails.ConfigFiles) == 0 { if len(configDetails.ConfigFiles) == 0 {
return composeFn(composeService, nil) return composeFn(composeService, nil)
@ -107,7 +105,7 @@ func withComposeService(
for i, service := range project.Services { for i, service := range project.Services {
for j, envFile := range service.EnvFiles { for j, envFile := range service.EnvFiles {
if !filepath.IsAbs(envFile.Path) { if !filepath.IsAbs(envFile.Path) {
project.Services[i].EnvFiles[j].Path = filepath.Join(project.WorkingDir, envFile.Path) project.Services[i].EnvFiles[j].Path = filepath.Join(filepath.Dir(filePaths[0]), envFile.Path)
} }
} }
} }