diff options
| author | Richard Hansen <rhansen@rhansen.org> | 2016-01-31 15:37:33 -0500 |
|---|---|---|
| committer | Richard Hansen <rhansen@rhansen.org> | 2016-01-31 16:30:32 -0500 |
| commit | c56fc47501a55d895825f652b19e1f554169a976 (patch) | |
| tree | 22b7890989c644828a9b77b48da870f0a27d269b | |
| parent | 2609cbb10fd6f8a28e74e388e0053ea0afe44ecf (diff) | |
| download | gitlab-c56fc47501a55d895825f652b19e1f554169a976.tar.gz | |
use 'docker stop' instead of 'docker kill'
The 'stop' command first tries SIGTERM before resorting to SIGKILL,
which is a gentler way to stop processes. (SIGTERM gives processes an
opportunity to clean up before exiting; SIGKILL can't be caught so it
is very abrupt.)
| -rwxr-xr-x | tools/build_test_env.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh index 883a8e1..38e874a 100755 --- a/tools/build_test_env.sh +++ b/tools/build_test_env.sh @@ -55,8 +55,8 @@ CONFIG=/tmp/python-gitlab.cfg cleanup() { rm -f "${CONFIG}" - log "Killing gitlab-test docker container..." - docker kill gitlab-test >/dev/null 2>&1 + log "Stopping gitlab-test docker container..." + docker stop gitlab-test >/dev/null 2>&1 log "Removing gitlab-test docker container..." docker rm gitlab-test >/dev/null 2>&1 log "Deactivating Python virtualenv..." |