X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3d7125ec931701fa7367234f480da5a9fd81ca78..dc08f17cc3c90714efafb11e38e27ca8ea1b5f5b:/tools/arvbox/lib/arvbox/docker/common.sh diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh index 5e16264c8a..d900f03772 100644 --- a/tools/arvbox/lib/arvbox/docker/common.sh +++ b/tools/arvbox/lib/arvbox/docker/common.sh @@ -13,7 +13,11 @@ export R_LIBS=/var/lib/Rlibs export HOME=$(getent passwd arvbox | cut -d: -f6) export ARVADOS_CONTAINER_PATH=/var/lib/arvados-arvbox export GEM_HOME=$HOME/.gem -GEMLOCK=$GEM_HOME/gems.lock +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 }') @@ -37,7 +41,6 @@ services=( [api]=8004 [controller]=8003 [controller-ssl]=8000 - [composer]=4200 [arv-git-httpd-ssl]=9000 [arv-git-httpd]=9001 [keep-web]=9003 @@ -75,6 +78,11 @@ run_bundler() { # If present, use the one associated with rails workbench or API BUNDLER=$PWD/bin/bundle fi + + if test -z "$(flock $GEMLOCK /var/lib/arvados/bin/gem list | grep 'arvados[[:blank:]].*[0-9.]*dev')" ; then + (cd /usr/src/arvados/sdk/ruby && \ + /var/lib/arvados/bin/gem build arvados.gemspec && flock $GEMLOCK /var/lib/arvados/bin/gem install $(ls -1 *.gem | sort -r | head -n1)) + fi if ! flock $GEMLOCK $BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then flock $GEMLOCK $BUNDLER install --verbose --no-deployment $frozen "$@" fi