diff options
| author | mo khan <mkhan@gitlab.com> | 2019-09-12 15:55:59 +0000 |
|---|---|---|
| committer | mo khan <mkhan@gitlab.com> | 2019-09-12 15:55:59 +0000 |
| commit | fa7a0dd6496b119b6f143ef8deba177b16f53d1c (patch) | |
| tree | f3f0738459d180a9ffa91c84c214ac75230774ff /Dockerfile | |
| parent | 8865a0bc643fdf4d3b679aff84e4f83ba2617936 (diff) | |
| parent | caa6ce0445aec8618924b41f7700173722e37d85 (diff) | |
Merge branch '13083-ruby-shim' into 'master'
Insert a shim to start generating v1 reports using the license finder Ruby API
See merge request gitlab-org/security-products/license-management!55
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -22,6 +22,9 @@ RUN apt-get update && \ libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \ rm -rf /var/lib/apt/lists/* +COPY . /opt/license-management/ +RUN bash -lc "cd /opt/license-management && gem build *.gemspec && gem install *.gem" + # Don't load RVM automatically, it doesn't work with GitLab-CI RUN mv /etc/profile.d/rvm.sh /rvm.sh @@ -43,6 +46,7 @@ RUN pip3 install --disable-pip-version-check setuptools==$SETUPTOOLS_VERSION && # Version of Python, defaults to Python 3.5 ARG LM_PYTHON_VERSION=3.5 ENV LM_PYTHON_VERSION $LM_PYTHON_VERSION +ENV LM_REPORT_VERSION ${LM_REPORT_VERSION:-1} COPY test /test COPY run.sh html2json.js / |