From 5c1ae24dd7b5fbf1eb2df09cdd947c3dcd2c02d6 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 13 Sep 2018 09:08:52 +0200 Subject: [PATCH 1/2] Adding tool: deployer --- Dockerfiles/work/Dockerfile-5.2 | 4 ++++ Dockerfiles/work/Dockerfile-5.3 | 4 ++++ Dockerfiles/work/Dockerfile-5.4 | 4 ++++ Dockerfiles/work/Dockerfile-5.5 | 4 ++++ Dockerfiles/work/Dockerfile-5.6 | 4 ++++ Dockerfiles/work/Dockerfile-7.0 | 4 ++++ Dockerfiles/work/Dockerfile-7.1 | 4 ++++ Dockerfiles/work/Dockerfile-7.2 | 4 ++++ Dockerfiles/work/Dockerfile-7.3 | 4 ++++ README.md | 4 ++++ build/ansible/group_vars/all.yml | 7 +++++++ 11 files changed, 47 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 7b92a99..1c24c16 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -127,6 +127,9 @@ 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 \ @@ -256,6 +259,7 @@ 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 f7ce512..1607b33 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -133,6 +133,9 @@ 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 \ @@ -296,6 +299,7 @@ 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/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8fcea60..3819afd 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -133,6 +133,9 @@ 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 \ @@ -309,6 +312,7 @@ 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/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 16908aa..2ef4704 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -137,6 +137,9 @@ 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 \ @@ -321,6 +324,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index b7d4969..972d262 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -137,6 +137,9 @@ 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 \ @@ -321,6 +324,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 8efa198..a2856ae 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -137,6 +137,9 @@ 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 \ @@ -321,6 +324,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index b7604a7..0e57642 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -137,6 +137,9 @@ 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 \ @@ -321,6 +324,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index cf3b90f..4173213 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -137,6 +137,9 @@ 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 \ @@ -321,6 +324,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 7658622..c49870b 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -137,6 +137,9 @@ 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 \ @@ -310,6 +313,7 @@ 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]+' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ && git-flow version | grep -E '[.0-9]+' \ diff --git a/README.md b/README.md index cd087a1..29da376 100644 --- a/README.md +++ b/README.md @@ -838,6 +838,10 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc composer Dependency Manager for PHP. + + deployer + Deployment tool for PHP. + drupal-console The Drupal CLI. A tool to generate boilerplate code, interact with and debug Drupal. diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index c4e0c73..c18915a 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -202,6 +202,7 @@ software_enabled: - asgardcms - awesomeci - codeception + - deployer - drush - drupalconsole - gitflow @@ -333,6 +334,12 @@ software_available: check: composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' all: command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + deployer: + disabled: [] + 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 + post: chmod +x /usr/local/bin/dep drush: disabled: [5.2] check: drush --version | grep -E '[.0-9]+' From 78227bf2eed1c4a4d611f03d1ae69dcd714730fd Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 13 Sep 2018 10:51:07 +0200 Subject: [PATCH 2/2] 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 1c24c16..7b92a99 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 1607b33..f7ce512 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 c18915a..bc6575b 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