diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d80342..3498c4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ - Removed `xlswriter` for PHP 8.1 - Removed `linuxbrew` for all versions - [#201](https://github.com/devilbox/docker-php-fpm/issues/201) Deactivated `psr` and `phalcon` by default +- Removed `drush9` from PHP 7.0 and 7.1 +- Removed `drupalconsole` from PHP 7.0 and 7.1 ## Release 0.123 diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index ceeb6d1..5f16800 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -213,20 +213,6 @@ RUN set -eux \ && rm -rf /usr/local/src/drush8/misc \ \ \ -# -------------------- drush9 -------------------- - && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ -&& cd /usr/local/src/drush9 \ -&& git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ - \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \ -&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ -&& rm -rf /usr/local/src/drush9/.git \ -&& rm -rf /usr/local/src/drush9/docs \ -&& rm -rf /usr/local/src/drush9/examples \ -&& rm -rf /usr/local/src/drush9/misc \ - \ - \ # -------------------- gitflow -------------------- && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ && cd /tmp/gitflow \ @@ -566,7 +552,6 @@ RUN set -eux \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && drush9 --version | grep -E '9[.0-9]+\s*$' \ && git-flow version | grep -E '[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 1d38390..cfdb570 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -212,20 +212,6 @@ RUN set -eux \ && rm -rf /usr/local/src/drush8/misc \ \ \ -# -------------------- drush9 -------------------- - && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ -&& cd /usr/local/src/drush9 \ -&& git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ - \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \ -&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ -&& rm -rf /usr/local/src/drush9/.git \ -&& rm -rf /usr/local/src/drush9/docs \ -&& rm -rf /usr/local/src/drush9/examples \ -&& rm -rf /usr/local/src/drush9/misc \ - \ - \ # -------------------- gitflow -------------------- && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ && cd /tmp/gitflow \ @@ -565,7 +551,6 @@ RUN set -eux \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && drush9 --version | grep -E '9[.0-9]+\s*$' \ && git-flow version | grep -E '[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 4248e92..d433710 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -500,7 +500,7 @@ software_available: && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ drush9: - disabled: [5.2, 5.3, 5.4, 5.5, 8.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 7.0, 7.1, 8.0, 8.1] check: drush9 --version | grep -E '9[.0-9]+\s*$' all: pre: |