[ARVADOS] updated: 1.3.0-147-g3dca6408c

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  3dca6408c9886ae3591486ed43410096b0a28488 (commit)
      from  b2b98cbc9c213d2831405b6eb37e0f52fa2e9e17 (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 3dca6408c9886ae3591486ed43410096b0a28488
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jan 14 11:00:12 2019 -0500

    Fix arvbox demo for workbench2 no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index 7cb51edfd..dbfa3f112 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -6,6 +6,7 @@ FROM arvados/arvbox-base
 ARG arvados_version
 ARG sso_version=master
 ARG composer_version=master
+ARG workbench2_version=master
 
 RUN cd /usr/src && \
     git clone --no-checkout https://github.com/curoverse/arvados.git && \
@@ -13,7 +14,9 @@ RUN cd /usr/src && \
     git clone --no-checkout https://github.com/curoverse/sso-devise-omniauth-provider.git sso && \
     git -C sso checkout ${sso_version} && \
     git clone --no-checkout https://github.com/curoverse/composer.git && \
-    git -C composer checkout ${composer_version}
+    git -C composer checkout ${composer_version} && \
+    git clone --no-checkout https://github.com/curoverse/arvados-workbench2.git workbench2 && \
+    git -C workbench2 checkout ${workbench2_version}
 
 ADD service/ /var/lib/arvbox/service
 RUN ln -sf /var/lib/arvbox/service /etc
@@ -25,6 +28,7 @@ RUN echo "production" > /var/lib/arvados/workbench_rails_env
 RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
 
 RUN sudo -u arvbox /var/lib/arvbox/service/composer/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/workbench2/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/keep-web/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/sso/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/api/run-service --only-deps

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


hooks/post-receive
--