From 78227bf2eed1c4a4d611f03d1ae69dcd714730fd Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 13 Sep 2018 10:51:07 +0200 Subject: [PATCH] Disable deployer for PHP 5.2 and PHP 5.3 --- Dockerfiles/work/Dockerfile-5.2 | 4 ---- Dockerfiles/work/Dockerfile-5.3 | 4 ---- build/ansible/group_vars/all.yml | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 1c24c16b..7b92a993 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -127,9 +127,6 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ -# deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ - && chmod +x /usr/local/bin/dep \ # gitflow && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ && cd /tmp/gitflow \ @@ -259,7 +256,6 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ - && dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \ && git-flow version | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 1607b33d..f7ce5120 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -133,9 +133,6 @@ RUN set -x \ && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ -# deployer - && curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \ - && chmod +x /usr/local/bin/dep \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -299,7 +296,6 @@ RUN set -x \ && gulp --version | grep -E '[.0-9]+' \ \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \ && drush --version | grep -E '[.0-9]+' \ && git-flow version | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index c18915ac..bc6575bd 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -335,7 +335,7 @@ software_available: all: command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer deployer: - disabled: [] + disabled: [5.2, 5.3] check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' all: command: curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep