aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-14 18:20:18 +0000
committerGerrit Code Review <review@openstack.org>2016-06-14 18:20:19 +0000
commitf0fd3277dfcc826ac5bde951c5a5692f3d271563 (patch)
tree38462052ad3393805a1c1cec6455246333af1bc6
parenta6b2142cc6ea7b03e17e590675e1a104d0e01759 (diff)
parentf76e9a1e0d6ff5f0f4326bc51659027216bd8afc (diff)
downloadkolla-f0fd3277dfcc826ac5bde951c5a5692f3d271563.tar.gz
kolla-f0fd3277dfcc826ac5bde951c5a5692f3d271563.zip
Merge "Make cleanup remove restarting/exited containers"
-rwxr-xr-xtools/cleanup-containers2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 412da2f2e..14249c960 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -10,7 +10,7 @@ if [ -n "$1" ]; then
containers_to_kill=($(docker ps | grep -E "$1" | awk '{print $1}'))
volumes_to_remove=($(docker volume ls | grep -E "$1" | awk '{print $1}'))
else
- containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}")
+ containers_to_kill=$(docker ps --filter "label=kolla_version" --format "{{.Names}}" -a)
volumes_to_remove=$(docker inspect -f '{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}' ${containers_to_kill} | \
egrep -v '(^\s*$)' | sort | uniq)