projects
/
arvados-dev.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa4d046
)
Make use of the realclean build.sh feature to build the docker images.
author
Ward Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:24:09 +0000
(15:24 -0400)
committer
Ward Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:24:09 +0000
(15:24 -0400)
no issue #
jenkins/run-docker-tests.sh
patch
|
blob
|
history
diff --git
a/jenkins/run-docker-tests.sh
b/jenkins/run-docker-tests.sh
index 8ff87369ea0a0de3e79e44fedcfc839d478c1320..244c0d7311008db8016990e4850cdd3c3dd1db9c 100755
(executable)
--- a/
jenkins/run-docker-tests.sh
+++ b/
jenkins/run-docker-tests.sh
@@
-10,23
+10,24
@@
title () {
echo $WORKSPACE
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 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
# 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=$?
./build.sh
ECODE=$?