Allow environment expansion in Docker Compose file when running local:new

tucksaun · tucksaun · commit ddda06880801 · 2022-10-14T11:28:41.000-04:00
diff --git a/commands/local_new.go b/commands/local_new.go
@@ -270,7 +270,7 @@ func parseCLIServices(services []string) ([]*CloudService, error) {
 func parseDockerComposeServices(dir string) []*CloudService {
 	var cloudServices []*CloudService
 
-	options, err := compose.NewProjectOptions(nil, compose.WithWorkingDirectory(dir), compose.WithDefaultConfigPath, compose.WithConfigFileEnv)
+	options, err := compose.NewProjectOptions(nil, compose.WithWorkingDirectory(dir), compose.WithDefaultConfigPath, compose.WithConfigFileEnv, compose.WithEnv(os.Environ()))
 	if err != nil {
 		return nil
 	}
diff --git a/commands/local_new_test.go b/commands/local_new_test.go
@@ -21,14 +21,16 @@ package commands
 
 import (
 	"testing"
+	
+	"github.com/symfony-cli/symfony-cli/local/platformsh"
 )
 
 func TestParseDockerComposeServices(t *testing.T) {
 	for dir, expected := range map[string]CloudService{
 		"testdata/postgresql/noversion/": {
 			Name:    "database",
 			Type:    "postgresql",
-			Version: "13",
+			Version: platformsh.ServiceLastVersion("postgresql"),
 		},
 		"testdata/postgresql/10/": {
 			Name:    "database",
@@ -38,7 +40,7 @@ func TestParseDockerComposeServices(t *testing.T) {
 		"testdata/postgresql/14/": {
 			Name:    "database",
 			Type:    "postgresql",
-			Version: "13",
+			Version: platformsh.ServiceLastVersion("postgresql"),
 		},
 	} {
 		result := parseDockerComposeServices(dir)
diff --git a/commands/testdata/postgresql/10/docker-compose.yml b/commands/testdata/postgresql/10/docker-compose.yml
@@ -2,6 +2,6 @@ version: '3'
 
 services:
   database:
-    image: postgres:${POSTGRES_VERSION:-10}-alpine
+    image: postgres:10-alpine
     ports:
       - "5432"
diff --git a/commands/testdata/postgresql/next/docker-compose.yml b/commands/testdata/postgresql/next/docker-compose.yml
@@ -2,6 +2,6 @@ version: '3'
 
 services:
   database:
-    image: postgres:${POSTGRES_VERSION:-14}-alpine
+    image: postgres:14-alpine
     ports:
       - "5432"
