Merge pull request #1151 from LTe/docker-stop

Do not kill docker container with SIGKILL
This commit is contained in:
Michael Hobbs committed 2015-04-29 13:57:40 -07:00
commit da92419023
1 file changed
+2 -1
+2 -1
View File
@@ -91,7 +91,7 @@ case "$1" in
# if we can't post-deploy successfully, kill new container # if we can't post-deploy successfully, kill new container
kill_new() { kill_new() {
docker inspect $id &> /dev/null && docker kill $id > /dev/null docker inspect $id &> /dev/null && docker stop $id > /dev/null && docker kill $id > /dev/null
trap - INT TERM EXIT trap - INT TERM EXIT
kill -9 $$ kill -9 $$
} }
@@ -120,6 +120,7 @@ case "$1" in
exec >/dev/null 2>/dev/null </dev/null exec >/dev/null 2>/dev/null </dev/null
trap '' INT HUP trap '' INT HUP
sleep $WAIT sleep $WAIT
docker stop $oldid
docker kill $oldid docker kill $oldid
) & disown -a ) & disown -a
# Use trap since disown/nohup don't seem to keep child alive # Use trap since disown/nohup don't seem to keep child alive