From f1fd051f1f6cc89d1487c1c46a29f91bf4dca79c Mon Sep 17 00:00:00 2001
From: Pavel Savushkin <pavel.savushkin.mix@gmail.com>
Date: Sat, 13 Mar 2021 00:55:03 +0200
Subject: [PATCH] fix(drush package): bump version to support PHP 8.0

Bump a version of the package to support a correct build of the workspace for PHP 8.0

Closes #2869
---
 env-example          | 2 +-
 workspace/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/env-example b/env-example
index aebc0b6e..bf0f88a5 100644
--- a/env-example
+++ b/env-example
@@ -138,7 +138,7 @@ WORKSPACE_INSTALL_CASSANDRA=false
 WORKSPACE_INSTALL_GEARMAN=false
 WORKSPACE_INSTALL_MSSQL=false
 WORKSPACE_INSTALL_DRUSH=false
-WORKSPACE_DRUSH_VERSION=8.1.17
+WORKSPACE_DRUSH_VERSION=8.4.6
 WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
 WORKSPACE_INSTALL_WP_CLI=false
 WORKSPACE_INSTALL_AEROSPIKE=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 1225fc85..81873a54 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -209,7 +209,7 @@ RUN chmod -R 644 /etc/cron.d
 
 USER root
 
-RUN apt-get update -yqq
+RUN apt-get -yqq update
 
 ###########################################################################
 # Drush:
@@ -225,7 +225,7 @@ ARG DRUSH_VERSION
 ENV DRUSH_VERSION ${DRUSH_VERSION}
 
 RUN if [ ${INSTALL_DRUSH} = true ]; then \
-    apt-get -y install mysql-client && \
+    apt-get -qq -y install mysql-client && \
     # Install Drush 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 && \