From 72b675fa2a554ec5ff4806dc5b186d2fccb28328 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 20 Jul 2018 16:23:35 +0200 Subject: [PATCH] Add tool: Codeception --- Dockerfiles/work/Dockerfile-5.3 | 5 +++++ Dockerfiles/work/Dockerfile-5.4 | 5 +++++ Dockerfiles/work/Dockerfile-5.5 | 5 +++++ Dockerfiles/work/Dockerfile-5.6 | 5 +++++ Dockerfiles/work/Dockerfile-7.0 | 5 +++++ Dockerfiles/work/Dockerfile-7.1 | 5 +++++ Dockerfiles/work/Dockerfile-7.2 | 5 +++++ Dockerfiles/work/Dockerfile-7.3 | 5 +++++ build/ansible/group_vars/all.yml | 18 ++++++++++++++---- 9 files changed, 54 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 3bfab17..36023a1 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -265,6 +269,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 9bd8d6a..083e29f 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -278,6 +282,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 82255eb..d72f1d4 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -285,6 +289,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 0532a8d..7f1f2ed 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -285,6 +289,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 1c08e5d..74ac16c 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -285,6 +289,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 159e988..351db57 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -285,6 +289,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 e70be65..f2716ab 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -285,6 +289,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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 58b28ef..f42f7d3 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -112,6 +112,10 @@ RUN set -x \ && npm install -g mdlint \ && npm install -g gulp \ \ +# codeception + && 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 \ + \ # drush && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush \ && cd /usr/local/src/drush \ @@ -274,6 +278,7 @@ RUN set -x \ && mdlint --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\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/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index e4268a6..d3ded83 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1,5 +1,6 @@ --- +# All available Docker flavours (for each version) template_files: - src: DOCKERFILES/Dockerfile-base.j2 dst: "../../Dockerfiles/base/Dockerfile-{{ php_version }}" @@ -11,13 +12,12 @@ template_files: dst: "../../Dockerfiles/work/Dockerfile-{{ php_version }}" - - # Adds self-validating checks to Dockerfile # turn off for final build debug: True +# All available PHP version php_all_versions: - 5.3 - 5.4 @@ -29,6 +29,9 @@ php_all_versions: - 7.3 +# Global variables +compose_home: /usr/local/src/composer + ################################################################################ # Defines for Dockerfile "work" @@ -55,6 +58,7 @@ software_enabled: - composer # Normal packages start here - awesomeci + - codeception - drush - drupalconsole - gitflow @@ -202,6 +206,12 @@ software_available: && rm -rf /usr/local/src/drush/examples \ && rm -rf /usr/local/src/drush/misc \ && rm -rf /usr/local/src/drush/tests \ + codeception: + check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' + all: + command: | + COMPOSER_HOME="{{ compose_home }}" composer global require codeception/codeception --dev \ + && ln -s {{ compose_home }}/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ drupalconsole: disabled: [5.3, 5.4] check: drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' @@ -346,8 +356,8 @@ software_available: disabled: [5.3, 5.4] all: command: | - COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ + COMPOSER_HOME="{{ compose_home }}" composer global require "photoncms/installer" \ + && ln -s {{ compose_home }}/vendor/photoncms/installer/photon /usr/local/bin/photon \ sass: check: sass --version | grep -E '[.0-9]+' all: