[ARVADOS] updated: 1.3.0-1604-ge9a99c629

Git user git at public.curoverse.com
Thu Sep 12 13:15:01 UTC 2019


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

       via  e9a99c629b52d8444643d3115a05c6e6e55c084d (commit)
      from  b0b7c71773e5fe4dc9effb8326601e1e6d6c6925 (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 e9a99c629b52d8444643d3115a05c6e6e55c084d
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Sep 12 09:14:38 2019 -0400

    arvbox needs to pull branch to ensure latest 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 b3f803422..f474a6b23 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -243,6 +243,7 @@ run() {
         if ! test -d "$COMPOSER_ROOT" ; then
             git clone https://github.com/curoverse/composer.git "$COMPOSER_ROOT"
             git -C "$COMPOSER_ROOT" checkout arvados-fork
+            git -C "$COMPOSER_ROOT" pull
         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 c03b62ead..e6caa4624 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -11,12 +11,16 @@ ARG workbench2_version=master
 RUN cd /usr/src && \
     git clone --no-checkout https://github.com/curoverse/arvados.git && \
     git -C arvados checkout ${arvados_version} && \
+    git -C arvados pull && \
     git clone --no-checkout https://github.com/curoverse/sso-devise-omniauth-provider.git sso && \
     git -C sso checkout ${sso_version} && \
+    git -C sso pull && \
     git clone --no-checkout https://github.com/curoverse/composer.git && \
     git -C composer checkout ${composer_version} && \
+    git -C composer pull && \
     git clone --no-checkout https://github.com/curoverse/arvados-workbench2.git workbench2 && \
-    git -C workbench2 checkout ${workbench2_version}
+    git -C workbench2 checkout ${workbench2_version} && \
+    git -C workbench2 pull
 
 ADD service/ /var/lib/arvbox/service
 RUN ln -sf /var/lib/arvbox/service /etc

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list