summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-16 15:49:14 +0000
committermo khan <mo.khan@gmail.com>2019-12-16 15:49:14 +0000
commit449aa3730bd3df1be035052d081dc5dc3819339d (patch)
tree312b7f9491a473e9eeef58d58e11735b84f97a33
parent80f225ab300c0f518a5ef0268468c64505274ed3 (diff)
parente3f3c5de50ae071faec393f6405eb7a9c81c534a (diff)
Merge branch 'use-bundled-with-information' into 'master'v2.2.1
Use bundled with information from Gemfile.lock See merge request gitlab-org/security-products/license-management!96
-rwxr-xr-xrun.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/run.sh b/run.sh
index 11fb99a..404cf2b 100755
--- a/run.sh
+++ b/run.sh
@@ -111,9 +111,10 @@ case "$COMMAND" in
# So we ignore the error.
$($rvm_recommended_ruby) 2>/dev/null || true
rvm use .
+ bundler_version=$(grep -A1 "BUNDLED WITH" Gemfile.lock | tail -n 1)
+ gem install bundler -v "${bundler_version}" || gem install bundler
# rvm pulls outdated gems
# need this to update system bundler
- gem update --system
# We need to install the license_finder gem into this Ruby version too.
gem install license_finder -v "$LICENSE_FINDER_VERSION"
gem install --no-document /opt/license-management/*.gem