Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Oct 18, 2016
Merged

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

merged 2 commits into from Oct 18, 2016

Commits on Oct 17, 2016

  1. Add config parameter to change per-container stop timeout during daem… 

    …on shutdown

This fix tries to add a flag `--stop-timeout` to specify the timeout value
(in seconds) for the container to stop before SIGKILL is issued. If stop timeout
is not specified then the default timeout (10s) is used.

Additional test cases have been added to cover the change.

This fix is related to moby#22471. Another pull request will add `--shutdown-timeout`
to daemon for moby#22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
    @yongtang
    yongtang committed Oct 17, 2016
    Copy the full SHA
    e66d210 View commit details
    Browse the repository at this point in the history

  2. Update docker stop and docker restart to allow not specifying tim… 

    …eout and use the one specified at container creation time.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
    @yongtang
    yongtang committed Oct 17, 2016
    Copy the full SHA
    cc70378 View commit details
    Browse the repository at this point in the history