From fa9ac1e471c9521c272cf43b858e2f13ab41a9eb Mon Sep 17 00:00:00 2001
From: Marius van Zundert <marius.vanzundert@webcolorsgroup.com>
Date: Mon, 27 Feb 2017 13:53:40 +0100
Subject: [PATCH] Added workspace from env file and updated env-example

---
 docker-compose.yml | 38 +++++++++++++++++++-------------------
 env-example        |  7 +++++--
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 094ed9ab..08f0a95a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,25 +14,25 @@ services:
     workspace:
         build:
             context: ./workspace
-            args:
-                - INSTALL_XDEBUG=false
-                - INSTALL_SOAP=false
-                - INSTALL_MONGO=false
-                - INSTALL_NODE=false
-                - INSTALL_YARN=false
-                - INSTALL_DRUSH=false
-                - INSTALL_AEROSPIKE_EXTENSION=false
-                - INSTALL_V8JS_EXTENSION=false
-                - COMPOSER_GLOBAL_INSTALL=false
-                - INSTALL_WORKSPACE_SSH=false
-                - INSTALL_LARAVEL_ENVOY=false
-                - INSTALL_DEPLOYER=false
-                - INSTALL_LINUXBREW=false
-                - PUID=1000
-                - PGID=1000
-                - NODE_VERSION=stable
-                - YARN_VERSION=latest
-                - TZ=UTC
+            args:                
+                - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
+                - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
+                - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
+                - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
+                - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
+                - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
+                - INSTALL_AEROSPIKE_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION}
+                - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION}
+                - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
+                - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
+                - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+                - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+                - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
+                - PUID=${WORKSPACE_PUID}
+                - PGID=${WORKSPACE_PGID}
+                - NODE_VERSION=${WORKSPACE_NODE_VERSION}
+                - YARN_VERSION=${WORKSPACE_TIMEZONE}
+                - TZ=${WORKSPACE_TIMEZONE=UTC}
         volumes_from:
             - applications
         extra_hosts:
diff --git a/env-example b/env-example
index 5fa13c93..84c29181 100644
--- a/env-example
+++ b/env-example
@@ -20,16 +20,19 @@ APPLICATIONS_IMAGE_NAME=tianon/true
 APPLICATIONS_CONTAINER_NAME=applications
 
 # WORKSPACE
-WORKSPACE_BUILD_PATH=./workspace
-WORKSPACE_CONTAINER_NAME=workspace
 WORKSPACE_INSTALL_XDEBUG=false
+WORKSPACE_INSTALL_SOAP=false
 WORKSPACE_INSTALL_MONGO=false
 WORKSPACE_INSTALL_NODE=false
 WORKSPACE_INSTALL_YARN=false
 WORKSPACE_INSTALL_DRUSH=false
 WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false
+WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION=false
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
 WORKSPACE_INSTALL_WORKSPACE_SSH=false
+WORKSPACE_INSTALL_LARAVEL_ENVOY=false
+WORKSPACE_INSTALL_DEPLOYER=false
+WORKSPACE_INSTALL_LINUXBREW=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_NODE_VERSION=stable