[ARVADOS] updated: 68387de8c5b5c5950f2e10d315172658297835b9

Git user git at public.curoverse.com
Thu Oct 20 22:46:57 EDT 2016


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

       via  68387de8c5b5c5950f2e10d315172658297835b9 (commit)
      from  d6e4e65cf3aae701c3e02a814329757e869a1d6d (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 68387de8c5b5c5950f2e10d315172658297835b9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 20 22:46:54 2016 -0400

    Check docker version to decide whether to use -f with docker tag, refs #10025

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 54f5b82..d74b6d4 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -269,12 +269,17 @@ build() {
     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
     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 -f arvados/arvbox-demo:$GITHEAD arvados/arvbox-demo:latest
+        docker tag $FORCE arvados/arvbox-demo:$GITHEAD arvados/arvbox-demo:latest
     else
         docker build $NO_CACHE -t arvados/arvbox-dev:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.dev" "$ARVBOX_DOCKER"
-        docker tag -f arvados/arvbox-dev:$GITHEAD arvados/arvbox-dev:latest
+        docker tag $FORCE arvados/arvbox-dev:$GITHEAD arvados/arvbox-dev:latest
     fi
 }
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list