Updated license-finder to 5.9.0

3 files changed, 13 insertions, 15 deletions

diff --git a/Dockerfile b/Dockerfile
index 900019b..6199f7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG LICENSE_FINDER_VERSION=5.6.2
+ARG LICENSE_FINDER_VERSION=5.9.0
 
 FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION
 MAINTAINER GitLab
@@ -6,6 +6,10 @@ MAINTAINER GitLab
 ARG LICENSE_FINDER_VERSION
 ENV LICENSE_FINDER_VERSION $LICENSE_FINDER_VERSION
 
+# Current workaround due to a regression from 5.9.0
+# https://github.com/pivotal/LicenseFinder/issues/600
+ENV BUNDLE_GEMFILE=Gemfile
+
 # Install JDK 11
 RUN cd /tmp && \
     wget --quiet --no-cookies https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -O jdk-11.tgz && \
@@ -22,9 +26,6 @@ RUN apt-get update && \
     libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \
     rm -rf /var/lib/apt/lists/*
 
-# Don't load RVM automatically, it doesn't work with GitLab-CI
-RUN mv /etc/profile.d/rvm.sh /rvm.sh
-
 # Warning! Environment variable PIP_VERSION causes the upgrade of pip to fail.
 ARG VERSION_OF_PIP=19.1.1
 ENV VERSION_OF_PIP $VERSION_OF_PIP
diff --git a/README.md b/README.md
index 9695d35..3f0abae 100644
--- a/README.md
+++ b/README.md
@@ -61,17 +61,18 @@ The following table shows which languages and package managers are supported.
 | .NET       | [Nuget](https://www.nuget.org/)                                   |
 | Python     | [pip](https://pip.pypa.io/en/stable/)                             |
 | Ruby       | [gem](https://rubygems.org/)                                      |
+| PHP        | [composer](https://getcomposer.org)                               |
 
 Inject `SETUP_CMD` to the docker command to override the given package managers
 and run your custom command to setup your environment with a custom package manager.
 
-    ```sh
-    docker run \
-      --volume "$PWD":/code \
-      --env "SETUP_CMD=./my-custom-install-script.sh" \
-      --rm \
-      registry.gitlab.com/gitlab-org/security-products/license-management:latest analyze /code
-    ```
+```sh
+docker run \
+  --volume "$PWD":/code \
+  --env "SETUP_CMD=./my-custom-install-script.sh" \
+  --rm \
+  registry.gitlab.com/gitlab-org/security-products/license-management:latest analyze /code
+```
 
 ## Settings
 
diff --git a/run.sh b/run.sh
index 7adf439..1007471 100755
--- a/run.sh
+++ b/run.sh
@@ -94,10 +94,6 @@ case "$COMMAND" in
 
   analyze)
     # Analyze project
-
-    # Load RVM
-    source /rvm.sh
-
     # Change current directory to the project path.
     APP_PATH=$1
     shift