summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-18 13:13:42 +0000
committerGerrit Code Review <review@openstack.org>2017-01-18 13:13:42 +0000
commit536f57af2cd72a840edcf73ca255e343af422ba8 (patch)
tree2aea7e573ef0ec234ac231f175ab3ed7c191c3c8 /tools
parent8d7a7a4b6ce609028cd3ce6ed0cab3a9bb61e81f (diff)
parent95607f162d4bf3e9ef3ecb6019dc0c63eec3bbef (diff)
downloadkolla-536f57af2cd72a840edcf73ca255e343af422ba8.tar.gz
kolla-536f57af2cd72a840edcf73ca255e343af422ba8.zip
Merge "Remove custom images"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/cleanup-images10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/cleanup-images b/tools/cleanup-images
index 255c33791..4a5027f07 100755
--- a/tools/cleanup-images
+++ b/tools/cleanup-images
@@ -6,11 +6,15 @@ cd "$(dirname "$REAL_PATH")/.."
. tools/validate-docker-execute.sh
-KOLLA_IMAGES=$(docker images -a --filter "label=kolla_version" --format "{{.ID}}")
+if [ -n "$1" ]; then
+ KOLLA_IMAGES=$(docker images -a --filter "label=kolla_version" --format "{{.Repository}}\t{{.ID}}" | grep -E "$1" | awk '{print$2}')
+else
+ KOLLA_IMAGES=$(docker images -a --filter "label=kolla_version" --format "{{.ID}}")
+fi
if [[ -z "$KOLLA_IMAGES" ]]; then
echo "No images to cleanup, exit now."
exit 0
+else
+ docker rmi -f $KOLLA_IMAGES
fi
-
-docker rmi -f $@ $KOLLA_IMAGES