[ARVADOS] created: 7ffda8eec81106fe7d017f8fdb67ef1fa1a0f761

Git user git at public.curoverse.com
Sun Aug 21 22:14:19 EDT 2016


        at  7ffda8eec81106fe7d017f8fdb67ef1fa1a0f761 (commit)


commit 7ffda8eec81106fe7d017f8fdb67ef1fa1a0f761
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Sun Aug 21 22:13:55 2016 -0400

    9827: Use "arvbox rebuild" to ensure up to date arvados/arvbox-demo image.

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 0a5841d..d031694 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -125,7 +125,7 @@ timer_reset
 # clean up the docker build environment
 cd "$WORKSPACE"
 
-tools/arvbox/bin/arvbox build dev
+tools/arvbox/bin/arvbox rebuild localdemo
 ECODE=$?
 
 if [[ "$ECODE" != "0" ]]; then
@@ -133,7 +133,7 @@ if [[ "$ECODE" != "0" ]]; then
     EXITCODE=$(($EXITCODE + $ECODE))
 fi
 
-tools/arvbox/bin/arvbox build localdemo
+tools/arvbox/bin/arvbox build dev
 
 ECODE=$?
 
@@ -151,8 +151,8 @@ timer_reset
 if [[ "$ECODE" != "0" ]]; then
     title "upload arvados images SKIPPED because build failed"
 else
-    if [[ $upload == true ]]; then 
-        ## 20150526 nico -- *sometimes* dockerhub needs re-login 
+    if [[ $upload == true ]]; then
+        ## 20150526 nico -- *sometimes* dockerhub needs re-login
         ## even though credentials are already in .dockercfg
         docker login -u arvados
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list