OSDN Git Service
(root)
/
metasearch
/
grid-chef-repo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes utility scripts.
[metasearch/grid-chef-repo.git]
/
cookbooks
/
docker-grid
/
templates
/
default
/
usr
/
local
/
bin
/
docker_containers_cleanup
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
(file)
--- 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=''
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