From 77a2c6708a784ac6af460d454d97faf9fd95312b Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Wed, 7 Dec 2016 02:32:05 -0500 Subject: dovetail: docker running method improvement JIRA: DOVETAIL-152 Change-Id: Ib0ab73278b4a6dad83323647728fc2769cee3839 Signed-off-by: MatthewLi --- jjb/dovetail/dovetail-cleanup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'jjb/dovetail/dovetail-cleanup.sh') diff --git a/jjb/dovetail/dovetail-cleanup.sh b/jjb/dovetail/dovetail-cleanup.sh index 297222bb3..f215278db 100755 --- a/jjb/dovetail/dovetail-cleanup.sh +++ b/jjb/dovetail/dovetail-cleanup.sh @@ -1,20 +1,21 @@ #!/bin/bash + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" echo "Cleaning up docker containers/images..." # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/dovetail) ]]; then echo "Removing existing opnfv/dovetail containers..." - docker ps -a | grep opnfv/dovetail | awk '{print $1}' | xargs docker rm -f >$redirect + docker ps -a | grep opnfv/dovetail | awk '{print $1}' | xargs docker rm -f >${redirect} fi # Remove existing images if exist if [[ ! -z $(docker images | grep opnfv/dovetail) ]]; then echo "Docker images to remove:" - docker images | head -1 && docker images | grep opnfv/dovetail + docker images | head -1 && docker images | grep opnfv/dovetail >${redirect} image_tags=($(docker images | grep opnfv/dovetail | awk '{print $2}')) for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/dovetail:$tag..." - docker rmi opnfv/dovetail:$tag >$redirect + docker rmi opnfv/dovetail:$tag >${redirect} done fi -- cgit 1.2.3-korg