summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorTetiana Chupryna <tchupryna@gitlab.com>2019-10-24 13:38:32 +0000
committerTetiana Chupryna <tchupryna@gitlab.com>2019-10-24 13:38:32 +0000
commited6d15ee8d8167f94b7ca03f26526c7ab29aab02 (patch)
tree04fe5855bbd079a399f8fc2ccdf148c54bf1b024 /Dockerfile
parent1fd208bf51631029e89daf88600fdd62224c7207 (diff)
parentcdfa8116a4c7d0c7659ed98aee289b489646c658 (diff)
Merge branch '12651-dotnet-2.2+3.0' into 'master'v1.7.4
Install .NET Core 2.2 and .NET Core 3.0 See merge request gitlab-org/security-products/license-management!70
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 3316698..7aed72b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,10 @@ 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 .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 && \
apt-get install -y --no-install-recommends \
- libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \
+ libpq-dev libmysqlclient-dev realpath python3-dev python3-pip dotnet-sdk-2.2 dotnet-sdk-3.0 && \
rm -rf /var/lib/apt/lists/*
# Don't load RVM automatically, it doesn't work with GitLab-CI