[ARVADOS] updated: 62645650fcd451d2ea569c8e55526f6ed0db4fea

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  62645650fcd451d2ea569c8e55526f6ed0db4fea (commit)
      from  15d8499a8d95abbc4bc2dbbd0bcfd2a4c6666408 (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 62645650fcd451d2ea569c8e55526f6ed0db4fea
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 31 12:00:21 2016 -0400

    tag arvados/arvbox-base with latest so that FROM arvados/arvbox-base:latest works. refs #10025

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index d74b6d4..4749131 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -267,13 +267,14 @@ build() {
         echo "Could not find Dockerfile (expected it at $ARVBOX_DOCKER/Dockerfile.base)"
         exit 1
     fi
-    GITHEAD=$(cd $ARVBOX_DOCKER && git log --format=%H -n1 HEAD)
-    docker build --build-arg=arvados_version=$GITHEAD $NO_CACHE -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$ARVBOX_DOCKER"
     if docker --version |grep " 1\.[0-9]\." ; then
         # Docker version prior 1.10 require -f flag
         # -f flag removed in Docker 1.12
         FORCE=-f
     fi
+    GITHEAD=$(cd $ARVBOX_DOCKER && git log --format=%H -n1 HEAD)
+    docker build --build-arg=arvados_version=$GITHEAD $NO_CACHE -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$ARVBOX_DOCKER"
+    docker tag $FORCE arvados/arvbox-base:$GITHEAD arvados/arvbox-base:latest
     if test "$1" = localdemo -o "$1" = publicdemo ; then
         docker build $NO_CACHE -t arvados/arvbox-demo:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.demo" "$ARVBOX_DOCKER"
         docker tag $FORCE arvados/arvbox-demo:$GITHEAD arvados/arvbox-demo:latest

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


hooks/post-receive
--