do not interpolate service.environment

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

interpolation/interpolation.go

@@ -33,6 +33,8 @@ type Options struct {
 	TypeCastMapping map[tree.Path]Cast
 	// Substitution function to use
 	Substitute func(string, template.Mapping) (string, error)
+	// Exclude do not run interpolation on matching paths
+	Exclude []tree.Path
 }
 
 // LookupValue is a function which maps from variable names to values.
@@ -70,6 +72,11 @@ func Interpolate(config map[string]interface{}, opts Options) (map[string]interf
 }
 
 func recursiveInterpolate(value interface{}, path tree.Path, opts Options) (interface{}, error) {
+	for _, pattern := range opts.Exclude {
+		if path.Matches(pattern) {
+			return value, nil
+		}
+	}
 	switch value := value.(type) {
 	case string:
 		newValue, err := opts.Substitute(value, template.Mapping(opts.LookupValue))

loader/loader.go

@@ -362,6 +362,9 @@ func toOptions(configDetails *types.ConfigDetails, options []func(*Options)) *Op
 		op(opts)
 	}
 	opts.ResourceLoaders = append(opts.ResourceLoaders, localResourceLoader{configDetails.WorkingDir})
+	if opts.SkipResolveEnvironment {
+		opts.Interpolate.Exclude = append(opts.Interpolate.Exclude, "services.*.environment")
+	}
 	return opts
 }
 

schema/compose-spec.json

@@ -604,52 +604,7 @@
           "type": "string",
           "description": "Target platform to run on, e.g., 'linux/amd64', 'linux/arm64', or 'windows/amd64'."
         },
-        "ports": {
-          "type": "array",
-          "description": "Expose container ports. Short format ([HOST:]CONTAINER[/PROTOCOL]).",
-          "items": {
-            "oneOf": [
-              {"type": "number"},
-              {"type": "string"},
-              {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "type": "string",
-                    "description": "A human-readable name for this port mapping."
-                  },
-                  "mode": {
-                    "type": "string",
-                    "description": "The port binding mode, either 'host' for publishing a host port or 'ingress' for load balancing."
-                  },
-                  "host_ip": {
-                    "type": "string",
-                    "description": "The host IP to bind to."
-                  },
-                  "target": {
-                    "type": ["integer", "string"],
-                    "description": "The port inside the container."
-                  },
-                  "published": {
-                    "type": ["string", "integer"],
-                    "description": "The publicly exposed port."
-                  },
-                  "protocol": {
-                    "type": "string",
-                    "description": "The port protocol (tcp or udp)."
-                  },
-                  "app_protocol": {
-                    "type": "string",
-                    "description": "Application protocol to use with the port (e.g., http, https, mysql)."
-                  }
-                },
-                "additionalProperties": false,
-                "patternProperties": {"^x-": {}}
-              }
-            ]
-          },
-          "uniqueItems": true
-        },
+        "ports": {"$ref": "#/definitions/ports"},
         "post_start": {
           "type": "array",
           "items": {"$ref": "#/definitions/service_hook"},
@@ -929,6 +884,14 @@
       "type": ["object", "null"],
       "description": "Development configuration for the service, used for development workflows.",
       "properties": {
+        "command": {
+          "$ref": "#/definitions/command",
+          "description": "Command to execute in development mode."
+        },
+        "ports":  {
+          "$ref": "#/definitions/ports",
+          "description": "Additional ports to expose in development mode. Short format ([HOST:]CONTAINER[/PROTOCOL])."
+        },
         "watch": {
           "type": "array",
           "description": "Configure watch mode for the service, which monitors file changes and performs actions in response.",
@@ -1589,6 +1552,53 @@
       "required": ["command"]
     },
 
+    "ports": {
+      "type": "array",
+      "description": "Expose container ports. Short format ([HOST:]CONTAINER[/PROTOCOL]).",
+      "items": {
+        "oneOf": [
+          {"type": "number"},
+          {"type": "string"},
+          {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "A human-readable name for this port mapping."
+              },
+              "mode": {
+                "type": "string",
+                "description": "The port binding mode, either 'host' for publishing a host port or 'ingress' for load balancing."
+              },
+              "host_ip": {
+                "type": "string",
+                "description": "The host IP to bind to."
+              },
+              "target": {
+                "type": ["integer", "string"],
+                "description": "The port inside the container."
+              },
+              "published": {
+                "type": ["string", "integer"],
+                "description": "The publicly exposed port."
+              },
+              "protocol": {
+                "type": "string",
+                "description": "The port protocol (tcp or udp)."
+              },
+              "app_protocol": {
+                "type": "string",
+                "description": "Application protocol to use with the port (e.g., http, https, mysql)."
+              }
+            },
+            "additionalProperties": false,
+            "patternProperties": {"^x-": {}}
+          }
+        ]
+      },
+      "uniqueItems": true
+    },
+
     "env_file": {
       "oneOf": [
         {