diff options
| author | Can Eldem <celdem@gitlab.com> | 2019-12-05 17:06:27 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2019-12-05 17:06:27 +0000 |
| commit | daf6c9d460938ff58ba910cf4b518082f34378f6 (patch) | |
| tree | 1269089ec3853a4a42be338d26f468d566876d1c /Dockerfile | |
| parent | 669ee51b1296d0fa18501fddec4ac64f5ec43dc2 (diff) | |
| parent | 0749b1f14a5a1632a433550a59420054cbab4f28 (diff) | |
Merge branch 'update-license-finder' into 'master'v2.1.0
Update license finder to 5.9.2
See merge request gitlab-org/security-products/license-management!86
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -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 @@ -16,15 +16,14 @@ RUN npm install npm-install-peers # Don't let Rubygem fail with the numerous projects using PG or MySQL, # install realpath, includes for python3, and pip for python3 +# Install additional php packages for better composer package support # Install .NET Core 2.2, 3.0 because it is not installed in the license_finder image (https://github.com/pivotal/LicenseFinder/pull/632). -RUN apt-get update && \ +RUN add-apt-repository ppa:ondrej/php -y && apt-get update -y && \ apt-get install -y --no-install-recommends \ - libpq-dev libmysqlclient-dev realpath python3-dev python3-pip dotnet-sdk-2.2 dotnet-sdk-3.0 && \ + libpq-dev libmysqlclient-dev realpath python3-dev python3-pip dotnet-sdk-2.2 dotnet-sdk-3.0 \ + php7.1-mbstring php7.1-intl php7.1-xml php7.1-soap -y && \ 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 @@ -48,6 +47,5 @@ ENV LM_REPORT_VERSION ${LM_REPORT_VERSION:-1} COPY test /test COPY run.sh / COPY . /opt/license-management/ -RUN bash -lc "source /rvm.sh && cd /opt/license-management && gem build *.gemspec && gem install *.gem" - -ENTRYPOINT ["/run.sh"] +RUN bash -lc "cd /opt/license-management && gem build *.gemspec && gem install *.gem" +ENTRYPOINT ["/run.sh"]
\ No newline at end of file |