Skip to content
This repository has been archived by the owner on Nov 23, 2019. It is now read-only.

Add config parameter to change per-container stop timeout during daemon shutdown #271

Merged
merged 1 commit into from Jun 15, 2016
Merged

Add config parameter to change per-container stop timeout during daemon shutdown #271

merged 1 commit into from Jun 15, 2016

Conversation

yongtang
Copy link
Contributor

This fix tries to add config paramter to change per-contaienr stop timeout during the daemon shutdown. As the part of the update, this fix also changes docker restart and docker stop so that if --time is not specified, then the default stop timeout (10s) will be used.

This fix is related to
moby/moby#22566
moby/moby#22471

Signed-off-by: Yong Tang yong.tang.github@outlook.com

…on shutdown

This fix tries to add config paramter to change per-contaienr stop timeout during
the daemon shutdown. As the part of the update, this fix also changes `docker restart`
and `docker stop` so that if `--time` is not specified, then the default stop timeout
(10s) will be used.

This fix is related to
moby/moby#22566
moby/moby#22471

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@thaJeztah
Copy link
Member

LGTM

1 similar comment
@calavera
Copy link
Contributor

LGTM

@calavera calavera merged commit f50fbe5 into docker:master Jun 15, 2016
@yongtang yongtang deleted the 22471-daemon-shutdown-timeout branch July 15, 2016 22:41
@stevvooe
Copy link
Contributor

stevvooe commented Sep 8, 2016

"Make the zero-value useful"

Could we please stop adding needless pointer values everywhere? This is getting tiresome. 1ns is just as good as zero and doesn't cause all kinds of havoc.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants