summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 91b7b5e..900019b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG LICENSE_FINDER_VERSION=5.9.2
+ARG LICENSE_FINDER_VERSION=5.6.2
FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION
MAINTAINER GitLab
@@ -13,10 +13,6 @@ 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,
@@ -26,6 +22,9 @@ 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