toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23232 from thaJeztah/update-default-retries

Browse Source 
Healthcheck: set default retries to 3
Upstream-commit: 3db23a4eaf19d347c486f0f0ae764ea1b84491c0
Component: engine
This commit is contained in:
Vincent Demeester
2016-06-04 07:50:04 +02:00
parent 47fe12cae3 52ca58bbaa
commit f88056a4aa
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/builder/dockerfile/parser/testfiles/health/Dockerfile
View File

@ -2,7 +2,7 @@ FROM debian
ADD check.sh main.sh /app/
CMD /app/main.sh
HEALTHCHECK
HEALTHCHECK --interval=5s --timeout=3s --retries=1 \
HEALTHCHECK --interval=5s --timeout=3s --retries=3 \
CMD /app/check.sh --quiet
HEALTHCHECK CMD
HEALTHCHECK CMD a b

2
components/engine/builder/dockerfile/parser/testfiles/health/result
View File

@ -2,7 +2,7 @@
(add "check.sh" "main.sh" "/app/")
(cmd "/app/main.sh")
(healthcheck)
(healthcheck ["--interval=5s" "--timeout=3s" "--retries=1"] "CMD" "/app/check.sh --quiet")
(healthcheck ["--interval=5s" "--timeout=3s" "--retries=3"] "CMD" "/app/check.sh --quiet")
(healthcheck "CMD")
(healthcheck "CMD" "a b")
(healthcheck ["--timeout=3s"] "CMD" "foo")