From 058b978f6798a58c5599c46665185e3603e7cc06 Mon Sep 17 00:00:00 2001
From: Zachary Knight <knightzac@gmail.com>
Date: Wed, 24 Jul 2019 13:58:45 +0000
Subject: Upgraded docker license finder

---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 900019b..91b7b5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG LICENSE_FINDER_VERSION=5.6.2
+ARG LICENSE_FINDER_VERSION=5.9.2
 
 FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION
 MAINTAINER GitLab
@@ -13,6 +13,10 @@ RUN cd /tmp && \
     mv jdk-11.0.2+9 /usr/lib/jvm/adoptopen_jdk11 && \
     rm /tmp/jdk-11.tgz
 
+# Install additional php packages for better composer package support
+RUN add-apt-repository ppa:ondrej/php && apt update -y && \
+    apt install php7.1-mbstring php7.1-intl php7.1-xml php7.1-soap -y
+
 RUN npm install npm-install-peers cheerio
 
 # Don't let Rubygem fail with the numerous projects using PG or MySQL,
@@ -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
-- 
cgit v1.2.3