arvbox needs to pull branch to ensure latest no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index b3f8034223865a853e93ac22e4ec91f49f6d5066..f474a6b23be33fdd58135396c1ca66e79611232e 100755 (executable)
--- 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 c03b62ead72cf9ae2c801ce612466b6b46cfafd1..e6caa4624eaaabe82143856879f44a11d5f20adf 100644 (file)
--- 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