openstack/kolla-ansible
Code Issues Proposed changes

Merge "Improve scripts with some check before kick rm command"

Browse Source
This commit is contained in:
Jenkins 2015-09-02 05:00:18 +00:00 committed by Gerrit Code Review
commit f9b95dad8f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/cleanup-containers
View File

@ -1,3 +1,7 @@
#!/bin/bash
docker rm $@ $(docker ps -a -q)
CONTAINERS=`docker ps -a -q`
if [[ -z "$CONTAINERS" ]]; then
echo "No containers to cleanup, exit now."
exit 0
fi
docker rm $@ $CONTAINERS

7
tools/cleanup-images
View File

@ -6,4 +6,9 @@ cd "$(dirname "$REAL_PATH")/.."
. tools/validate-docker-execute
docker rmi $@ $(docker images -a -q)
IMAGES=`docker images -a -q`
if [[ -z "$IMAGES" ]]; then
echo "No images to cleanup, exit now."
exit 0
fi
docker rmi $@ $IMAGES