Merge branch '1.5'

This commit is contained in:
Matthias Radestock committed 2016-05-09 11:50:09 +01:00
commit db1ac2a343
3 files changed
+57 -15

No files matched your search

+28 -3
View File
@@ -828,9 +828,24 @@ with_container_netns() {
return $STATUS
}
kill_container() {
docker kill $1 >/dev/null 2>&1 || true
}
kill_container_process() {
kill -9 $(docker inspect --format='{{.State.Pid}}' $1) >/dev/null 2>&1 || true
}
with_container_netns_or_die() {
if ! with_container_netns "$@" >/dev/null ; then
docker kill $1 >/dev/null 2>&1 || true
kill_container $1
exit 1
fi
}
with_container_netns_or_kill() {
if ! with_container_netns "$@" >/dev/null ; then
kill_container_process $1
exit 1
fi
}
@@ -1129,7 +1144,7 @@ wait_for_status() {
while true ; do
"$@" GET /status >/dev/null 2>&1 && return 0
if ! check_running $container >/dev/null 2>&1 ; then
docker kill $container >/dev/null 2>&1 || true # stop it restarting
kill_container $container # stop it restarting
echo $(death_msg $container) >&2
return 1
fi
@@ -1456,7 +1471,14 @@ ipam_cidrs() {
ipam_cidrs_or_die() {
if ! ipam_cidrs "$@" ; then
docker kill $2 >/dev/null 2>&1 || true
kill_container $2
exit 1
fi
}
ipam_cidrs_or_kill() {
if ! ipam_cidrs "$@" ; then
kill_container_process $2
exit 1
fi
}
@@ -2137,6 +2159,9 @@ EOF
--or-die)
ATTACH_TYPE="_or_die"
;;
--or-kill)
ATTACH_TYPE="_or_kill"
;;
--rewrite-hosts)
REWRITE_HOSTS=1
;;