[arvados] updated: 2.1.0-3086-gdc08f17cc
git repository hosting
git at public.arvados.org
Thu Dec 1 21:33:37 UTC 2022
Summary of changes:
tools/arvbox/bin/arvbox | 10 ----------
tools/arvbox/lib/arvbox/docker/common.sh | 4 ++++
tools/arvbox/lib/arvbox/docker/service/ready/run-service | 5 +++--
tools/arvbox/lib/arvbox/docker/service/sdk/run-service | 3 +++
4 files changed, 10 insertions(+), 12 deletions(-)
via dc08f17cc3c90714efafb11e38e27ca8ea1b5f5b (commit)
via d1ac2864e09de2e8cf7450191e7dbd969b30fa13 (commit)
from e5db78600aa8e617ca250c4b15f09e4d05b866cc (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 dc08f17cc3c90714efafb11e38e27ca8ea1b5f5b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 1 13:41:38 2022 -0500
arvbox changes: yank Composer. Add link to documentation.
Also set locale.
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 e7416947d..b3b9a5fcb 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -44,10 +44,6 @@ if test -z "$ARVADOS_ROOT" ; then
ARVADOS_ROOT="$ARVBOX_DATA/arvados"
fi
-if test -z "$COMPOSER_ROOT" ; then
- COMPOSER_ROOT="$ARVBOX_DATA/composer"
-fi
-
if test -z "$WORKBENCH2_ROOT" ; then
WORKBENCH2_ROOT="$ARVBOX_DATA/workbench2"
fi
@@ -138,7 +134,6 @@ wait_for_arvbox() {
docker_run_dev() {
docker run \
"--volume=$ARVADOS_ROOT:/usr/src/arvados:rw" \
- "--volume=$COMPOSER_ROOT:/usr/src/composer:rw" \
"--volume=$WORKBENCH2_ROOT:/usr/src/workbench2:rw" \
"--volume=$PG_DATA:/var/lib/postgresql:rw" \
"--volume=$VAR_DATA:$ARVADOS_CONTAINER_PATH:rw" \
@@ -257,10 +252,6 @@ run() {
git clone https://git.arvados.org/arvados.git "$ARVADOS_ROOT"
git -C "$ARVADOS_ROOT" checkout $ARVADOS_BRANCH
fi
- if ! test -d "$COMPOSER_ROOT" ; then
- git clone https://github.com/arvados/composer.git "$COMPOSER_ROOT"
- git -C "$COMPOSER_ROOT" checkout arvados-fork
- 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
@@ -613,7 +604,6 @@ case "$subcmd" in
"$ARVBOX_BASE/$1/gopath" \
"$ARVBOX_BASE/$1/Rlibs" \
"$ARVBOX_BASE/$1/arvados" \
- "$ARVBOX_BASE/$1/composer" \
"$ARVBOX_BASE/$1/workbench2" \
"$ARVBOX_BASE/$2"
echo "Created new arvbox $2"
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index ba81426f0..d900f0377 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -15,6 +15,10 @@ export ARVADOS_CONTAINER_PATH=/var/lib/arvados-arvbox
export GEM_HOME=$HOME/.gem
GEMLOCK=$HOME/gems.lock
+export LANG=en_US.UTF-8
+export LANGUAGE=en_US:en
+export LC_ALL=en_US.UTF-8
+
defaultdev=$(/sbin/ip route|awk '/default/ { print $5 }')
dockerip=$(/sbin/ip route | grep default | awk '{ print $3 }')
containerip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index 5007fe0be..1e9aae0c4 100755
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -89,7 +89,8 @@ fi
echo
echo "Your Arvados-in-a-box is ready!"
-echo "Workbench is running at https://$localip"
-echo "Workbench2 is running at https://$localip:${services[workbench2-ssl]}"
+echo "Workbench is hosted at https://$localip"
+echo "Workbench2 is hosted at https://$localip:${services[workbench2-ssl]}"
+echo "Documentation is hosted at http://$localip:${services[doc]}"
rm -r /tmp/arvbox-ready
commit d1ac2864e09de2e8cf7450191e7dbd969b30fa13
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Nov 3 10:48:29 2022 -0400
Set up ruby sdk, no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/tools/arvbox/lib/arvbox/docker/service/sdk/run-service b/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
index 62eb50c7a..d3ff7e868 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
@@ -14,6 +14,9 @@ cat > ~/.pip/pip.conf <<EOF
download_cache = /var/lib/pip
EOF
+cd /usr/src/arvados/sdk/ruby
+run_bundler --binstubs=binstubs
+
cd /usr/src/arvados/sdk/cli
run_bundler --binstubs=binstubs
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list