Merge pull request #1520 from fnandogp/master

fix: Fix Drush install for the workspace
This commit is contained in:
Shao Yu-Lung (Allen) 2018-05-28 10:30:50 +08:00 committed by GitHub
commit a03ce23bf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -322,10 +322,12 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
USER root USER root
ARG INSTALL_DRUSH=false ARG INSTALL_DRUSH=false
ARG DRUSH_VERSION=${DRUSH_VERSION}
RUN if [ ${INSTALL_DRUSH} = true ]; then \ RUN if [ ${INSTALL_DRUSH} = true ]; then \
apt-get update -yqq && \
apt-get -y install mysql-client && \ apt-get -y install mysql-client && \
# Install Drush 8 with the phar file. # 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 && \ 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 && \ chmod +x /usr/local/bin/drush && \
drush core-status \ drush core-status \
@ -340,6 +342,7 @@ USER root
ARG INSTALL_DRUPAL_CONSOLE=false ARG INSTALL_DRUPAL_CONSOLE=false
RUN if [ ${INSTALL_DRUPAL_CONSOLE} = true ]; then \ RUN if [ ${INSTALL_DRUPAL_CONSOLE} = true ]; then \
apt-get update -yqq && \
apt-get -y install mysql-client && \ apt-get -y install mysql-client && \
curl https://drupalconsole.com/installer -L -o drupal.phar && \ curl https://drupalconsole.com/installer -L -o drupal.phar && \
mv drupal.phar /usr/local/bin/drupal && \ mv drupal.phar /usr/local/bin/drupal && \