diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-02 05:00:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-02 05:00:18 +0000 |
| commit | f9b95dad8f5b4614281d809ccbc01973ca1c362f (patch) | |
| tree | 0d34e00a8f9a7845d117924d657fa4569942ff98 | |
| parent | d4fc93d88372834ae983d7c204c62633d07fd140 (diff) | |
| parent | da68e2eccc3c4207ddacc4c887645447579d4fd2 (diff) | |
| download | kolla-f9b95dad8f5b4614281d809ccbc01973ca1c362f.tar.gz kolla-f9b95dad8f5b4614281d809ccbc01973ca1c362f.zip | |
Merge "Improve scripts with some check before kick rm command"
| -rwxr-xr-x | tools/cleanup-containers | 8 | ||||
| -rwxr-xr-x | tools/cleanup-images | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 7b0e8341e..b94c5db1e 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -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 diff --git a/tools/cleanup-images b/tools/cleanup-images index c0b1db55c..871afd1d1 100755 --- a/tools/cleanup-images +++ b/tools/cleanup-images @@ -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 |