[ARVADOS] updated: 2.1.0-1056-gafd472078
Git user
git at public.arvados.org
Wed Jul 14 18:51:11 UTC 2021
Summary of changes:
tools/arvbox/bin/arvbox | 3 ---
tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 3 ---
2 files changed, 6 deletions(-)
via afd47207817a4d2a0ac76acd8175ed9a49fc1b6d (commit)
from a473534ef25367c250cc5a0bc7c57cd1e11b8c57 (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 afd47207817a4d2a0ac76acd8175ed9a49fc1b6d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Wed Jul 14 14:50:07 2021 -0400
Don't pull arvbox checkouts after clone
We already have latest and tags/detached HEADS can't be pulled anyway
(and they fail, which is the real problem).
no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index ba3f2cd07..fd464974f 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -250,17 +250,14 @@ run() {
if ! test -d "$ARVADOS_ROOT" ; then
git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
git -C "$ARVADOS_ROOT" checkout $ARVADOS_BRANCH
- git -C "$ARVADOS_ROOT" pull
fi
if ! test -d "$COMPOSER_ROOT" ; then
git clone https://github.com/arvados/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://git.arvados.org/arvados-workbench2.git "$WORKBENCH2_ROOT"
git -C "$ARVADOS_ROOT" checkout $WORKBENCH2_BRANCH
- git -C "$ARVADOS_ROOT" pull
fi
if [[ "$CONFIG" = test ]] ; then
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index c285d53ca..92099614a 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -10,13 +10,10 @@ ARG workbench2_version=main
RUN cd /usr/src && \
git clone --no-checkout https://git.arvados.org/arvados.git && \
git -C arvados checkout ${arvados_version} && \
- git -C arvados pull && \
git clone --no-checkout https://github.com/arvados/composer.git && \
git -C composer checkout ${composer_version} && \
- git -C composer pull && \
git clone --no-checkout https://git.arvados.org/arvados-workbench2.git workbench2 && \
git -C workbench2 checkout ${workbench2_version} && \
- git -C workbench2 pull && \
chown -R 1000:1000 /usr/src
# avoid rebuilding arvados-server, it's already been built as part of the base image
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list