diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-01-16 10:24:11 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-01-16 10:24:11 +0000 |
| commit | 2074e7e5ea3012be6f3a72bd4af934a42b7202ca (patch) | |
| tree | ce9ec33580f0e6e3f9cf3df1aab2f2cf7b5601cb /Dockerfile | |
| parent | f4f59927f87944a4d73be26416a7334521875f40 (diff) | |
| parent | 34f162a4903d852d47bd5440839f7519eb6fa8f0 (diff) | |
Merge branch '12012-pipfile-lock' into 'master'v2.4.0
Add support for Pipfile.lock
See merge request gitlab-org/security-products/license-management!103
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -14,11 +14,12 @@ RUN npm install npm-install-peers # install realpath, includes for python3, and pip for python3 # Install additional php packages for better composer package support RUN add-apt-repository ppa:ondrej/php -y && apt-get update -y && \ + apt-get upgrade -y --no-install-recommends && \ apt-get install -y --no-install-recommends \ bsdmainutils \ libjpeg8-dev \ zlib1g-dev \ - libpq-dev libmysqlclient-dev realpath dotnet-sdk-2.2 dotnet-sdk-3.0 \ + libpq-dev libmysqlclient-dev realpath \ php7.1-mbstring php7.1-intl php7.1-xml php7.1-soap -y && \ git clone --depth 1 --branch v0.7.6 https://github.com/asdf-vm/asdf.git $HOME/.asdf && \ echo 'pip' >> $HOME/.default-python-packages && \ |