Merge pull request docker#4611 from thaJeztah/stack_start_interval_carry

stacks: Add schema 3.12, and add support for start interval
thaJeztah · Oct 20, 2023 · 60b5508 · 60b5508
2 parents 3e5f6ba + defa52b
commit 60b5508
Show file tree

Hide file tree

Showing 11 changed files with 724 additions and 34 deletions.
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -436,8 +436,8 @@ func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container
 		return nil, nil
 	}
 	var (
-		timeout, interval, startPeriod time.Duration
-		retries                        int
+		timeout, interval, startPeriod, startInterval time.Duration
+		retries                                       int
 	)
 	if healthcheck.Disable {
 		if len(healthcheck.Test) != 0 {
@@ -457,15 +457,19 @@ func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container
 	if healthcheck.StartPeriod != nil {
 		startPeriod = time.Duration(*healthcheck.StartPeriod)
 	}
+	if healthcheck.StartInterval != nil {
+		startInterval = time.Duration(*healthcheck.StartInterval)
+	}
 	if healthcheck.Retries != nil {
 		retries = int(*healthcheck.Retries)
 	}
 	return &container.HealthConfig{
-		Test:        healthcheck.Test,
-		Timeout:     timeout,
-		Interval:    interval,
-		Retries:     retries,
-		StartPeriod: startPeriod,
+		Test:          healthcheck.Test,
+		Timeout:       timeout,
+		Interval:      interval,
+		Retries:       retries,
+		StartPeriod:   startPeriod,
+		StartInterval: startInterval,
 	}, nil
 }
 

diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go
@@ -124,17 +124,24 @@ func TestConvertHealthcheck(t *testing.T) {
 	retries := uint64(10)
 	timeout := composetypes.Duration(30 * time.Second)
 	interval := composetypes.Duration(2 * time.Millisecond)
+	startPeriod := composetypes.Duration(time.Minute)
+	startInterval := composetypes.Duration(1 * time.Second)
+
 	source := &composetypes.HealthCheckConfig{
-		Test:     []string{"EXEC", "touch", "/foo"},
-		Timeout:  &timeout,
-		Interval: &interval,
-		Retries:  &retries,
+		Test:          []string{"EXEC", "touch", "/foo"},
+		Timeout:       &timeout,
+		Interval:      &interval,
+		Retries:       &retries,
+		StartPeriod:   &startPeriod,
+		StartInterval: &startInterval,
 	}
 	expected := &container.HealthConfig{
-		Test:     source.Test,
-		Timeout:  time.Duration(timeout),
-		Interval: time.Duration(interval),
-		Retries:  10,
+		Test:          source.Test,
+		Timeout:       time.Duration(timeout),
+		Interval:      time.Duration(interval),
+		StartPeriod:   time.Duration(startPeriod),
+		StartInterval: time.Duration(startInterval),
+		Retries:       10,
 	}
 
 	healthcheck, err := convertHealthcheck(source)

diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -1,4 +1,4 @@
-version: "3.10"
+version: "3.12"
 
 services:
   foo:
@@ -158,6 +158,7 @@ services:
       timeout: 1s
       retries: 5
       start_period: 15s
+      start_interval: 1s
 
     # Any valid image reference - repo, tag, id, sha
     image: redis

diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
@@ -8,7 +8,7 @@ import (
 
 func fullExampleConfig(workingDir, homeDir string) *types.Config {
 	return &types.Config{
-		Version:  "3.10",
+		Version:  "3.12",
 		Services: services(workingDir, homeDir),
 		Networks: networks(),
 		Volumes:  volumes(),
@@ -154,11 +154,12 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 				"x-foo": "bar",
 			},
 			HealthCheck: &types.HealthCheckConfig{
-				Test:        types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
-				Interval:    durationPtr(10 * time.Second),
-				Timeout:     durationPtr(1 * time.Second),
-				Retries:     uint64Ptr(5),
-				StartPeriod: durationPtr(15 * time.Second),
+				Test:          types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
+				Interval:      durationPtr(10 * time.Second),
+				Timeout:       durationPtr(1 * time.Second),
+				Retries:       uint64Ptr(5),
+				StartPeriod:   durationPtr(15 * time.Second),
+				StartInterval: durationPtr(1 * time.Second),
 			},
 			Hostname: "foo",
 			Image:    "redis",

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -181,7 +181,7 @@ func strPtr(val string) *string {
 }
 
 var sampleConfig = types.Config{
-	Version: "3.11",
+	Version: "3.12",
 	Services: []types.ServiceConfig{
 		{
 			Name:        "foo",

diff --git a/cli/compose/loader/testdata/full-example.json.golden b/cli/compose/loader/testdata/full-example.json.golden
@@ -252,7 +252,8 @@
         "timeout": "1s",
         "interval": "10s",
         "retries": 5,
-        "start_period": "15s"
+        "start_period": "15s",
+        "start_interval": "1s"
       },
       "image": "redis",
       "ipc": "host",
@@ -508,7 +509,7 @@
       "working_dir": "/code"
     }
   },
-  "version": "3.10",
+  "version": "3.12",
   "volumes": {
     "another-volume": {
       "name": "user_specified_name",

diff --git a/cli/compose/loader/testdata/full-example.yaml.golden b/cli/compose/loader/testdata/full-example.yaml.golden
@@ -1,4 +1,4 @@
-version: "3.10"
+version: "3.12"
 services:
   foo:
     build:
@@ -126,6 +126,7 @@ services:
       interval: 10s
       retries: 5
       start_period: 15s
+      start_interval: 1s
     image: redis
     ipc: host
     labels: