projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18657: Can't symlink to binstubs, need to invoke them in place
[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 d8f3680491cea3dc632875122fa728c2829dc598..f391376f39b8f6cd1aea68c4f3e1389fb45d2462 100644
(file)
--- a/
tools/arvbox/lib/arvbox/docker/common.sh
+++ b/
tools/arvbox/lib/arvbox/docker/common.sh
@@
-2,9
+2,11
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
+export RUBY_VERSION=2.7.0
+export BUNDLER_VERSION=2.2.19
+
export DEBIAN_FRONTEND=noninteractive
export DEBIAN_FRONTEND=noninteractive
-export GEM_HOME=/var/lib/arvados/lib/ruby/gems/2.5.0
-export PATH=${PATH}:/usr/local/go/bin:$GEM_HOME/bin:/var/lib/arvados/bin
+export PATH=${PATH}:/usr/local/go/bin:/var/lib/arvados/bin:/usr/src/arvados/sdk/cli/binstubs
export npm_config_cache=/var/lib/npm
export npm_config_cache_min=Infinity
export R_LIBS=/var/lib/Rlibs
export npm_config_cache=/var/lib/npm
export npm_config_cache_min=Infinity
export R_LIBS=/var/lib/Rlibs
@@
-60,18
+62,20
@@
else
fi
run_bundler() {
fi
run_bundler() {
+ GEMLOCK=/var/lib/arvados/lib/ruby/gems/gems.lock
+ flock $GEMLOCK /var/lib/arvados/bin/gem install --no-document bundler:$BUNDLER_VERSION
if test -f Gemfile.lock ; then
frozen=--frozen
else
frozen=""
fi
if test -f Gemfile.lock ; then
frozen=--frozen
else
frozen=""
fi
- BUNDLER=bundle
r
- if test -x $PWD/bin/bundle
r
; then
+ BUNDLER=bundle
+ if test -x $PWD/bin/bundle ; then
# If present, use the one associated with rails workbench or API
# If present, use the one associated with rails workbench or API
- BUNDLER=$PWD/bin/bundle
r
+ BUNDLER=$PWD/bin/bundle
fi
fi
- if ! flock $GEM
_HOME/gems.lock
$BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then
- flock $GEM
_HOME/gems.lock
$BUNDLER install --verbose --no-deployment $frozen "$@"
+ if ! flock $GEM
LOCK
$BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then
+ flock $GEM
LOCK
$BUNDLER install --verbose --no-deployment $frozen "$@"
fi
}
fi
}