浏览代码

use COMPOSE_PROFILES value only if no command line arg profiles used

Signed-off-by: Guillaume Lours <[email protected]>
Guillaume Lours 3 年之前
父节点
当前提交
533fc61634
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      cmd/compose/compose.go

+ 4 - 4
cmd/compose/compose.go

@@ -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()