From d0c0a8895efcc36d89f03e8869ad971bd2704d4a Mon Sep 17 00:00:00 2001
From: Lawrence Eldridge <info@obscuresounds.com>
Date: Tue, 30 May 2017 15:05:30 +0100
Subject: [PATCH] add global instance of larval installer for fresh projects.
 (#988)

---
 docker-compose.yml      |  1 +
 env-example             |  1 +
 workspace/Dockerfile-56 | 17 +++++++++++++++++
 workspace/Dockerfile-70 | 17 +++++++++++++++++
 workspace/Dockerfile-71 | 17 +++++++++++++++++
 5 files changed, 53 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f05663c2..93c6663e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,7 @@ services:
           - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
           - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
           - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+          - INSTALL_LARAVEL_INSTALLER=${WORKSPACE_INSTALL_LARAVEL_INSTALLER}
           - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER}
           - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW}
           - INSTALL_MC=${WORKSPACE_INSTALL_MC}
diff --git a/env-example b/env-example
index 7ec7e921..fc4832da 100644
--- a/env-example
+++ b/env-example
@@ -41,6 +41,7 @@ WORKSPACE_INSTALL_V8JS=false
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
 WORKSPACE_INSTALL_LARAVEL_ENVOY=false
+WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
 WORKSPACE_INSTALL_DEPLOYER=false
 WORKSPACE_INSTALL_LINUXBREW=false
 WORKSPACE_INSTALL_MC=false
diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
index 42d0256b..2ae0a6cd 100644
--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@@ -333,6 +333,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=true
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+    echo "" >> ~/.bashrc && \
+    echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+    && composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
index 9c7d5627..00747d81 100644
--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@@ -350,6 +350,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=true
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+	echo "" >> ~/.bashrc && \
+	echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+	&& composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
index 71d865b3..151df362 100644
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -350,6 +350,23 @@ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
     composer global require "laravel/envoy=~1.0" \
 ;fi
 
+#####################################
+# Laravel Installer:
+#####################################
+USER root
+
+ARG INSTALL_LARAVEL_INSTALLER=true
+ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
+
+RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \
+    # Install the Laravel Installer
+	echo "" >> ~/.bashrc && \
+	echo 'export PATH="~/.composer/vendor/bin:$PATH"' >> ~/.bashrc \
+	&& composer global require "laravel/installer" \
+;fi
+
+USER laradock
+
 #####################################
 # Deployer:
 #####################################