Merge remote-tracking branch 'origin/main' into fix/schema-validate-concurrency

Author: ndeloof

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6
     - name: Install Go
-      uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
+      uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
       with:
         go-version: ${{ matrix.go-version }}
         check-latest: true

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6
       -
         name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
         with:
           go-version-file: go.mod
       - run: go version

loader/normalize.go

@@ -133,6 +133,9 @@ func Normalize(dict map[string]any, env types.Mapping) (map[string]any, error) {
 			if len(dependsOn) > 0 {
 				service["depends_on"] = dependsOn
 			}
+
+			inheritPreStartImage(service)
+
 			services[name] = service
 		}
 
@@ -143,6 +146,25 @@ func Normalize(dict map[string]any, env types.Mapping) (map[string]any, error) {
 	return dict, nil
 }
 
+// inheritPreStartImage propagates the parent service's image to any pre_start
+// hook that does not declare its own, per compose-spec PR #647.
+func inheritPreStartImage(service map[string]any) {
+	hooks, ok := service["pre_start"].([]any)
+	if !ok {
+		return
+	}
+	image, ok := service["image"].(string)
+	if !ok || image == "" {
+		return
+	}
+	for _, h := range hooks {
+		hook := h.(map[string]any)
+		if _, set := hook["image"]; !set {
+			hook["image"] = image
+		}
+	}
+}
+
 func normalizeNetworks(dict map[string]any) {
 	var networks map[string]any
 	if n, ok := dict["networks"]; ok {

loader/normalize_test.go

@@ -376,3 +376,71 @@ services:
 	assert.NilError(t, err)
 	assert.DeepEqual(t, expect, model)
 }
+
+func TestNormalizePreStartInheritsServiceImage(t *testing.T) {
+	project := `
+name: myProject
+services:
+  app:
+    image: alpine
+    pre_start:
+      - command: ["migrate"]
+      - image: busybox
+        command: ["chown", "-R", "1000:1000", "/data"]
+  builder:
+    build:
+      context: .
+    pre_start:
+      - command: ["init"]
+  hybrid:
+    image: ubuntu
+    build:
+      context: .
+    pre_start:
+      - command: ["bootstrap"]
+`
+	expected := `
+name: myProject
+services:
+  app:
+    image: alpine
+    networks:
+      default: null
+    pre_start:
+      - command: ["migrate"]
+        image: alpine
+      - image: busybox
+        command: ["chown", "-R", "1000:1000", "/data"]
+  builder:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      default: null
+    pre_start:
+      - command: ["init"]
+  hybrid:
+    image: ubuntu
+    build:
+      context: .
+      dockerfile: Dockerfile
+    networks:
+      default: null
+    pre_start:
+      - command: ["bootstrap"]
+        image: ubuntu
+networks:
+  default:
+    name: myProject_default
+`
+	var model map[string]any
+	err := yaml.Unmarshal([]byte(project), &model)
+	assert.NilError(t, err)
+	model, err = Normalize(model, nil)
+	assert.NilError(t, err)
+
+	var expect map[string]any
+	err = yaml.Unmarshal([]byte(expected), &expect)
+	assert.NilError(t, err)
+	assert.DeepEqual(t, expect, model)
+}

loader/reset.go

@@ -40,7 +40,7 @@ type nodeCache struct {
 type ResetProcessor struct {
 	target        any
 	paths         []tree.Path
-	visitedNodes  map[*yaml.Node][]string
+	visitedNodes  map[*yaml.Node][]tree.Path
 	resolvedNodes map[*yaml.Node]nodeCache
 	visitCount    int
 	// maxNodeVisits is the per-document cap; when zero, defaultMaxNodeVisits is used.
@@ -49,7 +49,7 @@ type ResetProcessor struct {
 
 // UnmarshalYAML implement yaml.Unmarshaler
 func (p *ResetProcessor) UnmarshalYAML(value *yaml.Node) error {
-	p.visitedNodes = make(map[*yaml.Node][]string)
+	p.visitedNodes = make(map[*yaml.Node][]tree.Path)
 	p.resolvedNodes = make(map[*yaml.Node]nodeCache)
 	p.visitCount = 0
 	defer func() {
@@ -283,36 +283,41 @@ func (p *ResetProcessor) applyNullOverrides(target any, path tree.Path) error {
 
 func (p *ResetProcessor) checkForCycle(node *yaml.Node, path tree.Path) error {
 	paths := p.visitedNodes[node]
-	pathStr := path.String()
 
 	for _, prevPath := range paths {
 		// If we're visiting the exact same path, it's not a cycle
-		if pathStr == prevPath {
+		if path == prevPath {
 			continue
 		}
 
+		// Compare on the raw form so dots inside escaped segment names (e.g.
+		// service names containing ".") aren't conflated with path separators.
+		pathStr := string(path)
+		prevStr := string(prevPath)
+
 		// If either path is using a merge key, it's legitimate YAML merging
-		if strings.Contains(prevPath, "<<") || strings.Contains(pathStr, "<<") {
+		if strings.Contains(prevStr, "<<") || strings.Contains(pathStr, "<<") {
 			continue
 		}
 
 		// Only consider it a cycle if one path is contained within the other
 		// and they're not in different service definitions
-		if (strings.HasPrefix(pathStr, prevPath+".") ||
-			strings.HasPrefix(prevPath, pathStr+".")) &&
-			!areInDifferentServices(pathStr, prevPath) {
-			return fmt.Errorf("cycle detected: node at path %s references node at path %s", pathStr, prevPath)
+		if (strings.HasPrefix(pathStr, prevStr+".") ||
+			strings.HasPrefix(prevStr, pathStr+".")) &&
+			!areInDifferentServices(path, prevPath) {
+			return fmt.Errorf("cycle detected: node at path %s references node at path %s",
+				path.String(), prevPath.String())
 		}
 	}
 
-	p.visitedNodes[node] = append(paths, pathStr)
+	p.visitedNodes[node] = append(paths, path)
 	return nil
 }
 
 // areInDifferentServices checks if two paths are in different service definitions
-func areInDifferentServices(path1, path2 string) bool {
-	parts1 := strings.Split(path1, ".")
-	parts2 := strings.Split(path2, ".")
+func areInDifferentServices(path1, path2 tree.Path) bool {
+	parts1 := path1.Parts()
+	parts2 := path2.Parts()
 	for i := 0; i < len(parts1) && i < len(parts2); i++ {
 		if parts1[i] == "services" && i+1 < len(parts1) &&
 			parts2[i] == "services" && i+1 < len(parts2) {

loader/reset_test.go

@@ -143,6 +143,18 @@ services:
   backend-worker:
     <<: *common
     image: alpine:latest
+`,
+			expectError: false,
+		},
+		{
+			name: "dotted_service_names_prefix_no_cycle",
+			config: `
+name: test
+services:
+  test.unit: &shared
+    image: alpine
+  test: *shared
+  test.other: *shared
 `,
 			expectError: false,
 		},

loader/tests/service_hooks_test.go

@@ -17,8 +17,10 @@
 package tests
 
 import (
+	"context"
 	"testing"
 
+	"github.com/compose-spec/compose-go/v2/loader"
 	"github.com/compose-spec/compose-go/v2/types"
 	"gotest.tools/v3/assert"
 )
@@ -29,6 +31,17 @@ name: test
 services:
   test:
     image: alpine
+    pre_start:
+      - command: ["./manage.py", "migrate"]
+        user: root
+        working_dir: /app
+        environment:
+          - FOO=BAR
+      - image: busybox
+        command: sh -c 'chown -R 1000:1000 /data'
+        privileged: true
+        per_replica: true
+      - image: migrator:latest
     post_start:
       - command: echo start
         user: root
@@ -43,6 +56,25 @@ services:
         environment:
           FOO: BAR
 `)
+	assert.DeepEqual(t, p.Services["test"].PreStart, []types.ServiceHook{
+		{
+			Command:    types.ShellCommand{"./manage.py", "migrate"},
+			User:       "root",
+			WorkingDir: "/app",
+			Environment: types.MappingWithEquals{
+				"FOO": ptr("BAR"),
+			},
+		},
+		{
+			Image:      "busybox",
+			Command:    types.ShellCommand{"sh", "-c", "chown -R 1000:1000 /data"},
+			Privileged: true,
+			PerReplica: true,
+		},
+		{
+			Image: "migrator:latest",
+		},
+	})
 	assert.DeepEqual(t, p.Services["test"].PostStart, []types.ServiceHook{
 		{
 			Command:    types.ShellCommand{"echo", "start"},
@@ -65,3 +97,23 @@ services:
 		},
 	})
 }
+
+func TestPreStartInheritsServiceImage(t *testing.T) {
+	yaml := `
+name: test
+services:
+  test:
+    image: alpine
+    pre_start:
+      - command: ["migrate"]
+      - image: busybox
+        command: ["echo", "hi"]
+`
+	p, err := loader.LoadWithContext(context.TODO(), types.ConfigDetails{
+		ConfigFiles: []types.ConfigFile{{Filename: "compose.yml", Content: []byte(yaml)}},
+		Environment: map[string]string{},
+	})
+	assert.NilError(t, err)
+	assert.Equal(t, p.Services["test"].PreStart[0].Image, "alpine")
+	assert.Equal(t, p.Services["test"].PreStart[1].Image, "busybox")
+}

schema/compose-spec.json

@@ -688,6 +688,11 @@
           },
           "uniqueItems": true
         },
+        "pre_start": {
+          "type": "array",
+          "items": {"$ref": "#/$defs/pre_start_hook"},
+          "description": "Init containers to run to completion before the service container is started. Each step runs in its own ephemeral container, in declared order; a non-zero exit fails the bring-up of the service and its dependents."
+        },
         "post_start": {
           "type": "array",
           "items": {"$ref": "#/$defs/service_hook"},
@@ -1657,6 +1662,43 @@
       "required": ["command"]
     },
 
+    "pre_start_hook": {
+      "type": "object",
+      "description": "Configuration for a pre_start init container, run to completion before the service container starts.",
+      "properties": {
+        "command": {
+          "$ref": "#/$defs/command",
+          "description": "Command to execute. Optional when the chosen image's entrypoint already runs the intended command."
+        },
+        "image": {
+          "type": "string",
+          "description": "Image used for the ephemeral container. If omitted, the parent service's image is used."
+        },
+        "user": {
+          "type": "string",
+          "description": "User to run the command as. Defaults to the user declared in image (or to the service's user when image is omitted)."
+        },
+        "privileged": {
+          "type": ["boolean", "string"],
+          "description": "Whether to run the command with extended privileges."
+        },
+        "working_dir": {
+          "type": "string",
+          "description": "Working directory for the command. Defaults to the service's working directory."
+        },
+        "environment": {
+          "$ref": "#/$defs/list_or_dict",
+          "description": "Environment variables for the command. Appended to or overriding the service environment."
+        },
+        "per_replica": {
+          "type": ["boolean", "string"],
+          "description": "Whether the hook runs once per service replica (true), or once for the service as a whole before any replica starts (false, the default)."
+        }
+      },
+      "additionalProperties": false,
+      "patternProperties": {"^x-": {}}
+    },
+
     "env_file": {
       "oneOf": [
         {