Support start_period for healthcheck in Docker Compose

Signed-off-by: Li Yi <denverdino@gmail.com>
docker · Aug 29, 2017 · 0abdad6 · 0abdad6
1 parent 21b5bbe
commit 0abdad6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -114,6 +114,7 @@ services:
       interval: 10s
       timeout: 1s
       retries: 5
+      start_period: 15s
 
     # Any valid image reference - repo, tag, id, sha
     image: redis

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -756,10 +756,11 @@ func TestFullExample(t *testing.T) {
 			"somehost":  "162.242.195.82",
 		},
 		HealthCheck: &types.HealthCheckConfig{
-			Test:     types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
-			Interval: "10s",
-			Timeout:  "1s",
-			Retries:  uint64Ptr(5),
+			Test:        types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
+			Interval:    "10s",
+			Timeout:     "1s",
+			Retries:     uint64Ptr(5),
+			StartPeriod: "15s",
 		},
 		Hostname: "foo",
 		Image:    "redis",

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.4.json b/cli/compose/schema/data/config_schema_v3.4.json
@@ -324,7 +324,8 @@
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "timeout": {"type": "string"}
+        "timeout": {"type": "string"},
+        "start_period": {"type": "string"}
       }
     },
     "deployment": {

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -172,7 +172,7 @@ type HealthCheckConfig struct {
 	Timeout     string
 	Interval    string
 	Retries     *uint64
-	StartPeriod string
+	StartPeriod string `mapstructure:"start_period"`
 	Disable     bool
 }