tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9906 from glours/profiles-priority 

use COMPOSE_PROFILES value only if no command line arg profiles used
This commit is contained in:
Guillaume Lours 2022-11-15 18:03:11 +01:00 committed by GitHub
parent 32f29b833f 533fc61634
commit c53539e1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/compose/compose.go
View File

@ -209,6 +209,10 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
project.Services[i] = s project.Services[i] = s
} }
if profiles, ok := options.Environment["COMPOSE_PROFILES"]; ok && len(o.Profiles) == 0 {
o.Profiles = append(o.Profiles, strings.Split(profiles, ",")...)
}
if len(services) > 0 { if len(services) > 0 {
s, err := project.GetServices(services...) s, err := project.GetServices(services...)
if err != nil { if err != nil {
@ -217,10 +221,6 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
o.Profiles = append(o.Profiles, s.GetProfiles()...) o.Profiles = append(o.Profiles, s.GetProfiles()...)
} }
if profiles, ok := options.Environment["COMPOSE_PROFILES"]; ok {
o.Profiles = append(o.Profiles, strings.Split(profiles, ",")...)
}
project.ApplyProfiles(o.Profiles) project.ApplyProfiles(o.Profiles)
project.WithoutUnnecessaryResources() project.WithoutUnnecessaryResources()