Merge pull request #441 from ndeloof/include_env

loader/include.go

@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/compose-spec/compose-go/dotenv"
+	interp "github.com/compose-spec/compose-go/interpolation"
 	"github.com/compose-spec/compose-go/types"
 	"github.com/pkg/errors"
 )
@@ -74,11 +75,17 @@ func loadInclude(ctx context.Context, configDetails types.ConfigDetails, model *
 			return nil, err
 		}
 
-		imported, err := load(ctx, types.ConfigDetails{
+		config := types.ConfigDetails{
 			WorkingDir:  r.ProjectDirectory,
 			ConfigFiles: types.ToConfigFiles(r.Path),
 			Environment: env,
-		}, loadOptions, loaded)
+		}
+		loadOptions.Interpolate = &interp.Options{
+			Substitute:      options.Interpolate.Substitute,
+			LookupValue:     config.LookupEnv,
+			TypeCastMapping: options.Interpolate.TypeCastMapping,
+		}
+		imported, err := load(ctx, config, loadOptions, loaded)
 		if err != nil {
 			return nil, err
 		}

loader/loader_test.go

@@ -2528,7 +2528,7 @@ services:
 		},
 		{
 			Name:          "imported",
-			ContainerName: "imported",
+			ContainerName: "extends", // as defined by ./testdata/subdir/extra.env
 			Environment:   types.MappingWithEquals{"SOURCE": strPtr("extends")},
 			EnvFile: types.StringList{
 				filepath.Join(workingDir, "testdata", "subdir", "extra.env"),