From: Christian Franke <chris@opensourcerouting.org>
Date: Thu, 18 Oct 2018 10:07:24 +0000 (+0200)
Subject: Docker: Update buildscript not to delete old images
X-Git-Tag: frr-7.1-dev~144^2~12
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f1c0836f6700bff9743f08ecbbd99325c3b1d6ae;p=matthieu%2Ffrr.git

Docker: Update buildscript not to delete old images

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/tests/topotests/docker/docker.sh b/tests/topotests/docker/docker.sh
index ac40e6c5af..4dcee218c9 100755
--- a/tests/topotests/docker/docker.sh
+++ b/tests/topotests/docker/docker.sh
@@ -30,20 +30,7 @@ CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Script begin
 #
 
-OLD_IMAGE_SHA=$( \
-	docker images | \
-	egrep "^topotests" | \
-	sed -r "s/( )+/ /g" | \
-	cut -d " " -f 3 \
-)
-
-docker build --force-rm --pull --compress -t topotests . || \
-	log_fatal "failed to generate topotest docker image"
-
-if [ ! -z "$OLD_IMAGE_SHA" ]; then
-	log_info "Removing old topotest image"
-	docker rmi $OLD_IMAGE_SHA || \
-		log_warning "failed to remove old image"
-fi
-
-exit 0
+exec docker build --pull \
+		  --compress \
+		  -t frrrouting/topotests \
+		  .