Fix bug in removing docker containers and images

1. "unexpected unclosed action in range" occurs in "docker inspect -f $ops ..."
2. "No such image" occurs in "docker rmi ..."

Change-Id: I1a1ae9441beb3739585c8f2dcb63029b16c0c2fe
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh
index e0472a2..48a8723 100755 (executable)
--- a/ci/build_rpm/build_rpms.sh
+++ b/ci/build_rpm/build_rpms.sh
@@ -33,7 +33,7 @@ function cleanup_container {
     if [[ ! -z "$containers_to_kill" ]]; then
         ops='{{range .Mounts}} {{printf "%s\n" .Name }}{{end}}'
         volumes_to_remove=$(sudo docker inspect -f \
-                                                $ops ${containers_to_kill} \
+                                                "$ops" ${containers_to_kill} \
                                                 | egrep -v '(^\s*$)' \
                                                 | sort | uniq)
 
@@ -47,8 +47,7 @@ function cleanup_container {
 }
 
 function cleanup_docker_image {
-    images_to_delete=$(sudo docker images -a \
-                                          --format "{{.ID}}" \
+    images_to_delete=$(sudo docker images -q \
                                           --filter "label=daisy_image_version")
 
     echo "Removing images... $images_to_delete"