Merge pull request #114 from Kauhat/master

Added support to conditionally install Prestissimo
This commit is contained in:
Mahmoud Zalt 2016-06-23 08:36:48 +03:00 committed by GitHub
commit f0200626ba
3 changed files with 12 additions and 2 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
/logs /logs
.env

View File

@ -153,7 +153,10 @@ services:
### Workspace Utilities Container ########################### ### Workspace Utilities Container ###########################
workspace: workspace:
build: ./workspace build:
context: ./workspace
args:
INSTALL_PRESTISSIMO: ${INSTALL_PRESTISSIMO}
volumes_from: volumes_from:
- application - application
tty: true tty: true

View File

@ -88,3 +88,9 @@ RUN . ~/.bashrc
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
WORKDIR /var/www/laravel WORKDIR /var/www/laravel
# Install optional software
ARG INSTALL_PRESTISSIMO=false
RUN if [ "$INSTALL_PRESTISSIMO" = true ] ; then \
composer global require "hirak/prestissimo:^0.3"; \
fi