Commit 171cb28
committed
Make docker stop timeout configurable via STOP_TIMEOUT property
The --time argument to `docker stop` was previously hardcoded and could
not be adjusted for containers that need more time to shut down gracefully.
Modern Docker has also deprecated --time in favour of --timeout.
Add a static STOP_TIMEOUT field consistent with the existing
CLIENT_TIMEOUT and SKIP_RM_ON_STOP fields, and switch from the deprecated
--time flag to --timeout. The value can be overridden via the system
property:
org.jenkinsci.plugins.docker.workflow.client.DockerClient.STOP_TIMEOUT
or mutated from a Groovy init script at runtime.
Fixes #733
Related to #7191 parent 3e04e4f commit 171cb28
1 file changed
Lines changed: 8 additions & 1 deletion
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
89 | 96 | | |
90 | 97 | | |
91 | 98 | | |
| |||
182 | 189 | | |
183 | 190 | | |
184 | 191 | | |
185 | | - | |
| 192 | + | |
186 | 193 | | |
187 | 194 | | |
188 | 195 | | |
| |||
0 commit comments