[ARVADOS] updated: 1.3.0-1603-gb0b7c7177

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox                        | 1 +
 tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  b0b7c71773e5fe4dc9effb8326601e1e6d6c6925 (commit)
      from  1312bde09fd7533449a705c4d12516df18c83f28 (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 b0b7c71773e5fe4dc9effb8326601e1e6d6c6925
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Sep 11 16:26:19 2019 -0400

    Use arvados-fork for composer no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index e56fbd489..b3f803422 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -242,6 +242,7 @@ run() {
         fi
         if ! test -d "$COMPOSER_ROOT" ; then
             git clone https://github.com/curoverse/composer.git "$COMPOSER_ROOT"
+            git -C "$COMPOSER_ROOT" checkout arvados-fork
         fi
         if ! test -d "$WORKBENCH2_ROOT" ; then
             git clone https://github.com/curoverse/arvados-workbench2.git "$WORKBENCH2_ROOT"
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index dbfa3f112..c03b62ead 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -5,7 +5,7 @@
 FROM arvados/arvbox-base
 ARG arvados_version
 ARG sso_version=master
-ARG composer_version=master
+ARG composer_version=arvados-fork
 ARG workbench2_version=master
 
 RUN cd /usr/src && \

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


hooks/post-receive
--