From: Ward Vandewege <ward@curoverse.com>
Date: Thu, 14 Aug 2014 19:24:09 +0000 (-0400)
Subject: Make use of the realclean build.sh feature to build the docker images.
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/95620c2efb18c5a89cc88995f5c1a09a054d56a9

Make use of the realclean build.sh feature to build the docker images.

no issue #
---

diff --git a/jenkins/run-docker-tests.sh b/jenkins/run-docker-tests.sh
index 8ff8736..244c0d7 100755
--- a/jenkins/run-docker-tests.sh
+++ b/jenkins/run-docker-tests.sh
@@ -10,23 +10,24 @@ title () {
 
 echo $WORKSPACE
 
+# DOCKER
+title "Starting docker build"
+
 # clean up existing docker containers and images
 docker.io stop $(docker.io ps -a -q)
 docker.io rm $(docker.io ps -a -q)
 docker.io rmi $(docker.io images -q)
 
-# clean up build files so we can re-build
-rm -f $WORKSPACE/docker/*-image
+# clean up the docker build environment
+cd "$WORKSPACE"
+cd docker
+./build.sh realclean
 
-rm -f docker/config.yml
+rm -f config.yml
 
 # Get test config.yml file
-cp $HOME/docker/config.yml docker/
+cp $HOME/docker/config.yml .
 
-# DOCS
-title "Starting docker build"
-cd "$WORKSPACE"
-cd docker
 ./build.sh
 
 ECODE=$?