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

fix(libstack): empty project name [BE-10801] (#115)

release/2.24.0
Oscar Zhou 2024-11-13 02:20:41 +13:00 committed by GitHub
parent b4c36b0e48
commit 370d224d76
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import (
"github.com/portainer/portainer/pkg/libstack" "github.com/portainer/portainer/pkg/libstack"
"github.com/compose-spec/compose-go/v2/consts"
"github.com/compose-spec/compose-go/v2/dotenv" "github.com/compose-spec/compose-go/v2/dotenv"
"github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/loader"
"github.com/compose-spec/compose-go/v2/types" "github.com/compose-spec/compose-go/v2/types"
@ -72,7 +73,10 @@ 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} configDetails := types.ConfigDetails{
WorkingDir: options.WorkingDir,
Environment: make(map[string]string),
}
for _, p := range filePaths { for _, p := range filePaths {
configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p}) configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p})
@ -102,6 +106,13 @@ func withComposeService(
if options.ProjectName != "" { if options.ProjectName != "" {
o.SetProjectName(options.ProjectName, true) o.SetProjectName(options.ProjectName, true)
} else if nameFromEnv, ok := configDetails.Environment[consts.ComposeProjectName]; ok && nameFromEnv != "" {
o.SetProjectName(nameFromEnv, true)
} else {
o.SetProjectName(
loader.NormalizeProjectName(filepath.Base(configDetails.WorkingDir)),
false,
)
} }
}, },
) )