[ARVADOS-DEV] updated: 2213311cb8647e41604a94d64ddd02b21ae78411

[Git user]

Summary of changes:
 jenkins/run-build-docker-images.sh | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

       via  2213311cb8647e41604a94d64ddd02b21ae78411 (commit)
      from  97424aa89b3f279986621ec5f574670dacb5a836 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2213311cb8647e41604a94d64ddd02b21ae78411
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Mar 2 10:35:55 2016 -0500

    Build arvbox instead of the old docker images.
    
    refs #8231

diff --git a/jenkins/run-build-docker-images.sh b/jenkins/run-build-docker-images.sh
index 71910c2..0a5841d 100755
--- a/jenkins/run-build-docker-images.sh
+++ b/jenkins/run-build-docker-images.sh
@@ -124,15 +124,16 @@ timer_reset
 
 # clean up the docker build environment
 cd "$WORKSPACE"
-cd docker
-./build.sh realclean
 
-rm -f config.yml
+tools/arvbox/bin/arvbox build dev
+ECODE=$?
 
-# Get test config.yml file
-cp $HOME/docker/config.yml .
+if [[ "$ECODE" != "0" ]]; then
+    title "!!!!!! docker BUILD FAILED !!!!!!"
+    EXITCODE=$(($EXITCODE + $ECODE))
+fi
 
-./build.sh
+tools/arvbox/bin/arvbox build localdemo
 
 ECODE=$?
 
@@ -155,14 +156,8 @@ else
         ## even though credentials are already in .dockercfg
         docker login -u arvados
 
-        docker_push arvados/api
-        docker_push arvados/compute
-        docker_push arvados/doc
-        docker_push arvados/workbench
-        docker_push arvados/keep
-        docker_push arvados/keepproxy
-        docker_push arvados/shell
-        docker_push arvados/sso
+        docker_push arvados/arvbox-dev
+        docker_push arvados/arvbox-demo
         title "upload arvados images complete (`timer`)"
     else
         title "upload arvados images SKIPPED because no --upload option set"

-----------------------------------------------------------------------


hooks/post-receive
--