Skip to content

Commit e9919f6

Browse files
committed
add support of healthcheck.start_interval attribut
Signed-off-by: Guillaume Lours <[email protected]>
1 parent 2cef411 commit e9919f6

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

loader/full-example.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ services:
181181
timeout: 1s
182182
retries: 5
183183
start_period: 15s
184+
start_interval: 5s
184185

185186
# Any valid image reference - repo, tag, id, sha
186187
image: redis

loader/full-struct_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,12 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
195195
"x-foo": "bar",
196196
},
197197
HealthCheck: &types.HealthCheckConfig{
198-
Test: types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
199-
Interval: durationPtr(10 * time.Second),
200-
Timeout: durationPtr(1 * time.Second),
201-
Retries: uint64Ptr(5),
202-
StartPeriod: durationPtr(15 * time.Second),
198+
Test: types.HealthCheckTest([]string{"CMD-SHELL", "echo \"hello world\""}),
199+
Interval: durationPtr(10 * time.Second),
200+
Timeout: durationPtr(1 * time.Second),
201+
Retries: uint64Ptr(5),
202+
StartPeriod: durationPtr(15 * time.Second),
203+
StartInterval: durationPtr(5 * time.Second),
203204
},
204205
Hostname: "foo",
205206
Image: "redis",
@@ -751,6 +752,7 @@ services:
751752
interval: 10s
752753
retries: 5
753754
start_period: 15s
755+
start_interval: 5s
754756
image: redis
755757
ipc: host
756758
labels:
@@ -1358,7 +1360,8 @@ func fullExampleJSON(workingDir, homeDir string) string {
13581360
"timeout": "1s",
13591361
"interval": "10s",
13601362
"retries": 5,
1361-
"start_period": "15s"
1363+
"start_period": "15s",
1364+
"start_interval": "5s"
13621365
},
13631366
"image": "redis",
13641367
"ipc": "host",

schema/compose-spec.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,8 @@
457457
]
458458
},
459459
"timeout": {"type": "string", "format": "duration"},
460-
"start_period": {"type": "string", "format": "duration"}
460+
"start_period": {"type": "string", "format": "duration"},
461+
"start_interval": {"type": "string", "format": "duration"}
461462
},
462463
"additionalProperties": false,
463464
"patternProperties": {"^x-": {}}

types/types.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -603,12 +603,13 @@ type DeployConfig struct {
603603

604604
// HealthCheckConfig the healthcheck configuration for a service
605605
type HealthCheckConfig struct {
606-
Test HealthCheckTest `yaml:"test,omitempty" json:"test,omitempty"`
607-
Timeout *Duration `yaml:"timeout,omitempty" json:"timeout,omitempty"`
608-
Interval *Duration `yaml:"interval,omitempty" json:"interval,omitempty"`
609-
Retries *uint64 `yaml:"retries,omitempty" json:"retries,omitempty"`
610-
StartPeriod *Duration `yaml:"start_period,omitempty" json:"start_period,omitempty"`
611-
Disable bool `yaml:"disable,omitempty" json:"disable,omitempty"`
606+
Test HealthCheckTest `yaml:"test,omitempty" json:"test,omitempty"`
607+
Timeout *Duration `yaml:"timeout,omitempty" json:"timeout,omitempty"`
608+
Interval *Duration `yaml:"interval,omitempty" json:"interval,omitempty"`
609+
Retries *uint64 `yaml:"retries,omitempty" json:"retries,omitempty"`
610+
StartPeriod *Duration `yaml:"start_period,omitempty" json:"start_period,omitempty"`
611+
StartInterval *Duration `yaml:"start_interval,omitempty" json:"start_interval,omitempty"`
612+
Disable bool `yaml:"disable,omitempty" json:"disable,omitempty"`
612613

613614
Extensions Extensions `yaml:"#extensions,inline" json:"-"`
614615
}

0 commit comments

Comments
 (0)