From 533fc61634c1d2ebc25d8889915f4cb6cd017a7d Mon Sep 17 00:00:00 2001
From: Guillaume Lours <705411+glours@users.noreply.github.com>
Date: Mon, 10 Oct 2022 13:53:39 +0200
Subject: [PATCH] use COMPOSE_PROFILES value only if no command line arg
 profiles used

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
---
 cmd/compose/compose.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go
index f10865521..43f91d2f2 100644
--- a/cmd/compose/compose.go
+++ b/cmd/compose/compose.go
@@ -209,6 +209,10 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
 		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 {
 		s, err := project.GetServices(services...)
 		if err != nil {
@@ -217,10 +221,6 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
 		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.WithoutUnnecessaryResources()