diff --git a/docker-compose.yml b/docker-compose.yml index c3cf9f00..f5b35571 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,10 +87,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 f17b541c..cfa5c47c 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 @@ -89,6 +88,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 @@ -349,7 +349,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 f95d554c..b02488c4 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -319,10 +319,14 @@ 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=${DRUSH_VERSION} +ARG DRUSH_VERSION +ENV DRUSH_VERSION ${DRUSH_VERSION} RUN if [ ${INSTALL_DRUSH} = true ]; then \ apt-get update -yqq && \