From 8f70779b1bb6c101ceec160b84c66ff90eb34135 Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Sat, 30 May 2015 09:18:31 -0700
Subject: [PATCH] Don't die if the "docker rmi" fails

Slightly neuters #8955, but we haven't had a build succeed in a while
for whatever reason. (I checked on Jenkins and the images in the build
log where deletion was attempted were actually deleted, so I think
this is primarily an exit code / API issue of some sort.)
---
 build/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/common.sh b/build/common.sh
index 022e95227d..70970f3d37 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -633,7 +633,7 @@ function kube::release::create_docker_images_for_server() {
         rm -rf ${docker_build_path}
 
         kube::log::status "Deleting docker image ${docker_image_tag}"
-        "${DOCKER[@]}" rmi ${docker_image_tag}
+        "${DOCKER[@]}" rmi ${docker_image_tag} 2>/dev/null || true
       ) &
     done