From bcb749151a60d620d49b81fe185a2fba3e50f0be Mon Sep 17 00:00:00 2001 From: Jack Fletcher Date: Wed, 22 Jun 2016 21:47:06 +0100 Subject: [PATCH] Added support to conditionally install Prestissimo --- .gitignore | 3 ++- docker-compose.yml | 5 ++++- workspace/Dockerfile | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df1a13b..b152f57 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/logs \ No newline at end of file +/logs +.env \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0626260..087cea3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -153,7 +153,10 @@ services: ### Workspace Utilities Container ########################### workspace: - build: ./workspace + build: + context: ./workspace + args: + INSTALL_PRESTISSIMO: ${INSTALL_PRESTISSIMO} volumes_from: - application tty: true diff --git a/workspace/Dockerfile b/workspace/Dockerfile index ab8cd6a..9e12b10 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -88,3 +88,9 @@ RUN . ~/.bashrc RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 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 \ No newline at end of file