From 8869b22a1d464e0f169422fcf0ecd6500fdaa721 Mon Sep 17 00:00:00 2001
From: Thor Erik Lie <thor@thorerik.com>
Date: Mon, 20 Mar 2017 10:33:25 +0100
Subject: [PATCH] fixes up so Yarn is installable again

---
 docker-compose.yml | 16 ++++++++--------
 env-example        |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 92892ee0..4034dbdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     workspace:
         build:
             context: ./workspace
-            args:                
+            args:
                 - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
                 - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
                 - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
@@ -32,7 +32,7 @@ services:
                 - PUID=${WORKSPACE_PUID}
                 - PGID=${WORKSPACE_PGID}
                 - NODE_VERSION=${WORKSPACE_NODE_VERSION}
-                - YARN_VERSION=${WORKSPACE_TIMEZONE}
+                - YARN_VERSION=${WORKSPACE_YARN_VERSION}
                 - TZ=${WORKSPACE_TIMEZONE}
         volumes_from:
             - applications
@@ -57,7 +57,7 @@ services:
                 - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
                 - INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
                 - INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
-                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}                
+                - INSTALL_AEROSPIKE_EXTENSION=${PHP_FPM_INSTALL_AEROSPIKE_EXTENSION}
                 - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
                 - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
                 - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
@@ -72,7 +72,7 @@ services:
             - "dockerhost:${DOCKER_HOST_IP}"
         environment:
             - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
-            
+
 ### PHP Worker Container #####################################
     php-worker:
         build:
@@ -91,7 +91,7 @@ services:
                 - PHP_UPSTREAM=php-fpm
         volumes_from:
             - applications
-        volumes:            
+        volumes:
             - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
             - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
         ports:
@@ -112,7 +112,7 @@ services:
         volumes:
             - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
             - ./apache2/sites:/etc/apache2/sites-available
-           
+
 
         ports:
             - "${APACHE_HOST_HTTP_PORT}:80"
@@ -349,9 +349,9 @@ services:
             - "${ELASTICSEARCH_HOST_TRANSPORT_PORT}:9300"
         depends_on:
             - php-fpm
-            
+
 ### Certbot Container ##################################
-            
+
     certbot:
         build:
             context: ./certbot
diff --git a/env-example b/env-example
index 35ce745f..7d5b154a 100644
--- a/env-example
+++ b/env-example
@@ -28,6 +28,7 @@ WORKSPACE_INSTALL_MC=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_NODE_VERSION=stable
+WORKSPACE_YARN_VERSION=latest
 WORKSPACE_TIMEZONE=UTC
 WORKSPACE_SSH_PORT=2222