From a463a62cdef50691f333c5c6f0d2860a542e138a Mon Sep 17 00:00:00 2001
From: Ward Vandewege <ward@curii.com>
Date: Fri, 25 Sep 2020 17:31:43 -0400
Subject: [PATCH] 16267: fix logic bug, use local checked out arvados directory
 in dev        mode, not the copy under ~/.arvbox

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---
 tools/arvbox/bin/arvbox | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index e8e3fa17ce..29f25daf8c 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -374,27 +374,25 @@ build() {
         FORCE=-f
     fi
     GITHEAD=$(cd $ARVBOX_DOCKER && git log --format=%H -n1 HEAD)
+
+    set +e
+    if which greadlink >/dev/null 2>/dev/null ; then
+        LOCAL_ARVADOS_ROOT=$(greadlink -f $(dirname $0)/../../../)
+    else
+        LOCAL_ARVADOS_ROOT=$(readlink -f $(dirname $0)/../../../)
+    fi
+    set -e
+
     if test "$1" = localdemo -o "$1" = publicdemo ; then
-        set +e
-        if which greadlink >/dev/null 2>/dev/null ; then
-          ARVADOS_ROOT=$(greadlink -f $(dirname $0)/../../../)
-        else
-          ARVADOS_ROOT=$(readlink -f $(dirname $0)/../../../)
-        fi
-        set -e
-        docker build --build-arg=BUILDTYPE=demo $NO_CACHE --build-arg=arvados_version=$GITHEAD --build-arg=workdir=/tools/arvbox/lib/arvbox/docker -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$ARVADOS_ROOT"
-        docker tag $FORCE arvados/arvbox-base:$GITHEAD arvados/arvbox-base:latest
-        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
+        BUILDTYPE=demo
     else
-        if ! test -d "$ARVADOS_ROOT" ; then
-            git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
-        fi
-        docker build --build-arg=BUILDTYPE=dev $NO_CACHE --build-arg=arvados_version=$GITHEAD --build-arg=workdir=/tools/arvbox/lib/arvbox/docker -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$ARVADOS_ROOT"
-        docker tag $FORCE arvados/arvbox-base:$GITHEAD arvados/arvbox-base:latest
-        docker build $NO_CACHE -t arvados/arvbox-dev:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.dev" "$ARVBOX_DOCKER"
-        docker tag $FORCE arvados/arvbox-dev:$GITHEAD arvados/arvbox-dev:latest
+        BUILDTYPE=dev
     fi
+
+    docker build --build-arg=BUILDTYPE=$BUILDTYPE $NO_CACHE --build-arg=arvados_version=$GITHEAD --build-arg=workdir=/tools/arvbox/lib/arvbox/docker -t arvados/arvbox-base:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.base" "$LOCAL_ARVADOS_ROOT"
+    docker tag $FORCE arvados/arvbox-base:$GITHEAD arvados/arvbox-base:latest
+    docker build $NO_CACHE -t arvados/arvbox-$BUILDTYPE:$GITHEAD -f "$ARVBOX_DOCKER/Dockerfile.$BUILDTYPE" "$ARVBOX_DOCKER"
+    docker tag $FORCE arvados/arvbox-$BUILDTYPE:$GITHEAD arvados/arvbox-$BUILDTYPE:latest
 }
 
 check() {
-- 
2.30.2