projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10484-count-clients' closes #10484
[arvados.git]
/
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 742658f5f1d797bdbaa068e3b029445b545b946f..230a189a9a244c79d94380960f82d4ad52ddb6c3 100644
(file)
--- a/
tools/arvbox/lib/arvbox/docker/common.sh
+++ b/
tools/arvbox/lib/arvbox/docker/common.sh
@@
-1,4
+1,8
@@
+export PATH=${PATH}:/usr/local/go/bin:/var/lib/gems/bin
+export GEM_HOME=/var/lib/gems
+export GEM_PATH=/var/lib/gems
+
if test -s /var/run/localip_override ; then
localip=$(cat /var/run/localip_override)
else
if test -s /var/run/localip_override ; then
localip=$(cat /var/run/localip_override)
else
@@
-6,9
+10,6
@@
else
localip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
fi
localip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
fi
-export GEM_HOME=/var/lib/gems
-export GEM_PATH=/var/lib/gems
-
declare -A services
services=(
[workbench]=80
declare -A services
services=(
[workbench]=80
@@
-38,6
+39,9
@@
run_bundler() {
else
frozen=""
fi
else
frozen=""
fi
+ if ! test -x bundle ; then
+ gem install --no-document bundler
+ fi
if ! flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --no-deployment $frozen "$@"
fi
if ! flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
flock /var/lib/gems/gems.lock bundle install --path $GEM_HOME --no-deployment $frozen "$@"
fi