InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added start period option to health check.

Browse Source 
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
This commit is contained in:
Elias Faxö
2016-11-29 10:58:47 +01:00
committed by Elias Faxö
parent 5b18e7c396
commit e401f63735
24 changed files with 404 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/commit.go
View File

@@ -94,6 +94,9 @@ func merge(userConf, imageConf *containertypes.Config) error {
if userConf.Healthcheck.Timeout == 0 {
userConf.Healthcheck.Timeout = imageConf.Healthcheck.Timeout
}
if userConf.Healthcheck.StartPeriod == 0 {
userConf.Healthcheck.StartPeriod = imageConf.Healthcheck.StartPeriod
}
if userConf.Healthcheck.Retries == 0 {
userConf.Healthcheck.Retries = imageConf.Healthcheck.Retries
}