X-Git-Url: http://git.osdn.net/view?p=metasearch%2Fgrid-chef-repo.git;a=blobdiff_plain;f=cookbooks%2Fdocker-grid%2Ftemplates%2Fdefault%2Fusr%2Flocal%2Fbin%2Fdocker_containers_cleanup;h=43610e7829af8a10ea0f371cd4a3def6ad5cd6ca;hp=aec92be10d1864b8414fb5fc09920eb440b28ddd;hb=8382a64b49b2e176436315b92512becf512a6bbe;hpb=3aa58a0e9f07946ff9df01b19d281c4f30c75103

diff --git a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
index aec92be..43610e7 100644
--- a/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
+++ b/cookbooks/docker-grid/templates/default/usr/local/bin/docker_containers_cleanup
@@ -8,4 +8,7 @@ if id $(whoami) | grep docker > /dev/null 2>&1; then
 fi 
 [ `whoami` = 'root' ] && sudo=''
 
-$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | xargs --no-run-if-empty docker rm
+if ! tty -s; then
+  echo `date '+%Y-%m-%d %H:%M:%S %z'`' Removing exited and dead containers ...'
+fi
+$sudo docker ps -q -f status=exited -f status=dead | awk '{print $1}' | $sudo xargs --no-run-if-empty docker rm