diff options
| author | mo khan <mo.khan@gmail.com> | 2019-10-22 20:24:29 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2019-10-22 20:24:29 +0000 |
| commit | 431f07f8d11b2bc2a8fd09351a4323c9df676822 (patch) | |
| tree | 4f40b60925a4edf8eace71ae8af65bb5d67c7b6b /Dockerfile | |
| parent | 7f175952a5a047d785b5ea72c15a10642523c62a (diff) | |
| parent | 561556fbd1f59492cfa8fdd790f2ce39c90f3a8d (diff) | |
Merge branch 'remove-tech-debt' into 'master'v1.7.2
Remove feature flags and temporary mappings
See merge request gitlab-org/security-products/license-management!75
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -12,8 +12,7 @@ RUN cd /tmp && \ tar xf /tmp/jdk-11.tgz && \ mv jdk-11.0.2+9 /usr/lib/jvm/adoptopen_jdk11 && \ rm /tmp/jdk-11.tgz - -RUN npm install npm-install-peers cheerio +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 @@ -46,7 +45,7 @@ ENV LM_PYTHON_VERSION $LM_PYTHON_VERSION ENV LM_REPORT_VERSION ${LM_REPORT_VERSION:-1} COPY test /test -COPY run.sh html2json.js / +COPY run.sh / COPY . /opt/license-management/ RUN bash -lc "source /rvm.sh && cd /opt/license-management && gem build *.gemspec && gem install *.gem" |