Merge branch 'master' of https://github.com/laradock/laradock into dev

* 'master' of https://github.com/laradock/laradock:
  update Install Symfony steps in the docs
  Update docker-compose.yml
  Update env-example
  Update Dockerfile-70
  fix rm error
This commit is contained in:
Mahmoud Zalt
2017-08-07 12:06:51 +03:00
5 changed files with 23 additions and 5 deletions

View File

@ -545,6 +545,19 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
;fi\
;fi
#####################################
# PYTHON:
#####################################
ARG INSTALL_PYTHON=false
ENV INSTALL_PYTHON ${INSTALL_PYTHON}
RUN if [ ${INSTALL_PYTHON} = true ]; then \
apt-get update \
&& apt-get -y install python python-pip python-dev build-essential \
&& pip install --upgrade pip \
&& pip install --upgrade virtualenv \
;fi
#
#--------------------------------------------------------------------------
# Final Touch