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 #1525 from ulyssessouza/fix-profiles 

Fix compose config --profiles
This commit is contained in:
Anca Iordache 2021-04-12 17:00:25 +02:00 committed by GitHub
parent aaf662b7ed 6dbfc71a0d
commit 8b245d99fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/cmd/compose/compose.go
View File

@ -77,13 +77,11 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
return nil, err
}
if len(services) != 0 {
s, err := project.GetServices(services...)
if err != nil {
return nil, err
}
o.Profiles = append(o.Profiles, s.GetProfiles()...)
s, err := project.GetServices(services...)
if err != nil {
return nil, err
}
o.Profiles = append(o.Profiles, s.GetProfiles()...)
if profiles, ok := options.Environment["COMPOSE_PROFILES"]; ok {
o.Profiles = append(o.Profiles, strings.Split(profiles, ",")...)

20
cli/cmd/compose/convert.go
View File

@ -78,7 +78,7 @@ func convertCommand(p *projectOptions) *cobra.Command {
return runHash(opts)
}
if opts.profiles {
return runProfiles(opts)
return runProfiles(opts, args)
}
return runConvert(cmd.Context(), opts, args)
@ -195,19 +195,19 @@ func runHash(opts convertOptions) error {
return nil
}
func runProfiles(opts convertOptions) error {
profiles := map[string]struct{}{}
project, err := opts.toProject(nil)
func runProfiles(opts convertOptions, services []string) error {
profiles := map[string]interface{}{}
_, err := opts.toProject(services)
if err != nil {
return err
}
for _, s := range project.Services {
for _, p := range s.Profiles {
profiles[p] = struct{}{}
if opts.projectOptions != nil {
for _, p := range opts.projectOptions.Profiles {
profiles[p] = nil
}
for p := range profiles {
fmt.Println(p)
}
}
for _, p := range profiles {
fmt.Println(p)
}
return nil
}