From 3ad17eca0acb35bf3c1d516d743a81c8a5528c9a Mon Sep 17 00:00:00 2001
From: Wouter van Dongen <wouter.vandongen@dongit.nl>
Date: Mon, 23 Apr 2018 20:30:47 +0200
Subject: [PATCH] - Fix Drush installation - Consistent naming of arguments -
 Add deprecated install note

---
 docker-compose.yml   | 2 +-
 env-example          | 6 +-----
 workspace/Dockerfile | 6 +++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 66c4f6e1..5d1909b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -86,10 +86,10 @@ services:
           - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
           - NODE_VERSION=${WORKSPACE_NODE_VERSION}
           - YARN_VERSION=${WORKSPACE_YARN_VERSION}
+          - DRUSH_VERSION=${WORKSPACE_DRUSH_VERSION}
           - TZ=${WORKSPACE_TIMEZONE}
           - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
           - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
-          - DRUSH_VERSION=${DRUSH_VERSION}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
       extra_hosts:
diff --git a/env-example b/env-example
index 87f4cefe..25bbaf11 100644
--- a/env-example
+++ b/env-example
@@ -70,7 +70,6 @@ DOCKER_SYNC_STRATEGY=native_osx
 
 ### WORKSPACE #############################################
 
-
 WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
 WORKSPACE_COMPOSER_REPO_PACKAGIST=
 WORKSPACE_INSTALL_NODE=true
@@ -88,6 +87,7 @@ WORKSPACE_INSTALL_MONGO=false
 WORKSPACE_INSTALL_AMQP=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_DRUSH=false
+WORKSPACE_DRUSH_VERSION=8.1.16
 WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
 WORKSPACE_INSTALL_AEROSPIKE=false
 WORKSPACE_INSTALL_V8JS=false
@@ -348,7 +348,3 @@ LARAVEL_ECHO_SERVER_PORT=6001
 SOLR_VERSION=5.5
 SOLR_PORT=8983
 SOLR_DATAIMPORTHANDLER_MYSQL=false
-
-### DRUSH_VERSION #########################################
-
-DRUSH_VERSION=9.2.3
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 66374198..da789740 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -299,13 +299,17 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
 # Drush:
 ###########################################################################
 
+# Deprecated install of Drush 8 and earlier versions.
+# Drush 9 and up require Drush to be listed as a composer dependency of your site.
+
 USER root
 
 ARG INSTALL_DRUSH=false
+ARG DRUSH_VERSION
+ENV DRUSH_VERSION ${DRUSH_VERSION}
 
 RUN if [ ${INSTALL_DRUSH} = true ]; then \
     apt-get -y install mysql-client && \
-    # Install Drush 8 with the phar file.
     curl -fsSL -o /usr/local/bin/drush https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar | bash && \
     chmod +x /usr/local/bin/drush && \
     drush core-status \