Merge branch 'upgrade-docker-license-finder' into 'master'

Upgraded docker license finder

See merge request gitlab-org/security-products/license-management!37

1 files changed, 4 insertions, 5 deletions

diff --git a/run.sh b/run.sh
index 0ce0266..019d087 100755
--- a/run.sh
+++ b/run.sh
@@ -95,9 +95,6 @@ case "$COMMAND" in
   analyze)
     # Analyze project
 
-    # Load RVM
-    source /rvm.sh
-
     # Change current directory to the project path.
     APP_PATH=$1
     shift
@@ -112,7 +109,9 @@ case "$COMMAND" in
             # So we ignore the error.
             $($rvm_recommended_ruby) 2>/dev/null || true
             rvm use .
-            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"
           fi
@@ -120,7 +119,7 @@ case "$COMMAND" in
           # Ignore test and development dependencies.
           license_finder ignored_groups add development
           license_finder ignored_groups add test
-          bundle install --without "development test"
+          bundle install
           skip_prepare=true
         fi