summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorZachary Knight <knightzac@gmail.com>2019-07-24 13:58:45 +0000
committerCan Eldem <celdem@gitlab.com>2019-07-24 13:58:45 +0000
commit058b978f6798a58c5599c46665185e3603e7cc06 (patch)
tree1e39b60e08690aaf86e3f36941aa5a61eb74eb1d /Dockerfile
parent248e7c20d7aea3dc32013a55913b1902ca8754e2 (diff)
Upgraded docker license finder
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile9
1 files changed, 5 insertions, 4 deletions
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