Merge pull request #4073 from yankay/fix-profile-in-compose

Fix: `env_file` in compose work with profile

Author: AkihiroSuda

cmd/nerdctl/compose/compose_up_linux_test.go

@@ -19,6 +19,7 @@ package compose
 import (
 	"fmt"
 	"io"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -499,6 +500,12 @@ func TestComposeUpProfile(t *testing.T) {
 	serviceRegular := testutil.Identifier(t) + "-regular"
 	serviceProfiled := testutil.Identifier(t) + "-profiled"
 
+	// write the env.common file to tmpdir
+	tmpDir := t.TempDir()
+	envFilePath := fmt.Sprintf("%s/env.common", tmpDir)
+	err := os.WriteFile(envFilePath, []byte("TEST_ENV_INJECTION=WORKS\n"), 0644)
+	assert.NilError(t, err)
+
 	dockerComposeYAML := fmt.Sprintf(`
 services:
   %s:
@@ -508,7 +515,9 @@ services:
     image: %[3]s
     profiles:
       - test-profile
-`, serviceRegular, serviceProfiled, testutil.NginxAlpineImage)
+    env_file:
+      - %[4]s
+`, serviceRegular, serviceProfiled, testutil.NginxAlpineImage, envFilePath)
 
 	// * Test with profile
 	//   Should run both the services:
@@ -521,6 +530,10 @@ services:
 	psCmd := base.Cmd("ps", "-a", "--format={{.Names}}")
 	psCmd.AssertOutContains(serviceRegular)
 	psCmd.AssertOutContains(serviceProfiled)
+
+	execCmd := base.ComposeCmd("-f", comp1.YAMLFullPath(), "exec", serviceProfiled, "env")
+	execCmd.AssertOutContains("TEST_ENV_INJECTION=WORKS")
+
 	base.ComposeCmd("-f", comp1.YAMLFullPath(), "--profile", "test-profile", "down", "-v").AssertOK()
 
 	// * Test without profile

pkg/composer/composer.go

@@ -84,6 +84,7 @@ func New(o Options, client *containerd.Client) (*Composer, error) {
 		composecli.WithEnvFiles(),
 		composecli.WithDotEnv,
 		composecli.WithName(o.Project),
+		composecli.WithProfiles(o.Profiles),
 	)
 
 	projectOptions, err := composecli.NewProjectOptions(o.ConfigPaths, optionsFn...)
@@ -95,19 +96,6 @@ func New(o Options, client *containerd.Client) (*Composer, error) {
 		return nil, err
 	}
 
-	if len(o.Services) > 0 {
-		s, err := project.GetServices(o.Services...)
-		if err != nil {
-			return nil, err
-		}
-		o.Profiles = append(o.Profiles, s.GetProfiles()...)
-	}
-
-	project, err = project.WithProfiles(o.Profiles)
-	if err != nil {
-		return nil, err
-	}
-
 	if o.DebugPrintFull {
 		projectJSON, _ := json.MarshalIndent(project, "", "    ")
 		log.L.Debug("printing project JSON")