Merge pull request #83 from ec-europa/develop

Fixes to platform build, drush double rr and backtrac update.

README.md

@@ -4,7 +4,7 @@
 <img align="left" width="50%" src="https://ec.europa.eu/info/sites/info/themes/europa/images/svg/logo/logo--en.svg" />
 
 <p>The NextEuropa Toolkit is a composer package designed to speed up the
-development of Drupal websites in the NextEuropa project. It's main component is
+development of Drupal websites in the NextEuropa project. Its main component is
 the Phing build system that builds your development environments, deploy
 and test packages.</p>
 

docs/building-codebase.md

@@ -62,6 +62,12 @@ the `./toolkit/phing build-platform` command.
 
 ## Subsite builds
 
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=xmiqSKByduE
+" target="_blank"><img src="http://img.youtube.com/vi/xmiqSKByduE/0.jpg" 
+alt="Upgrade screencast" width="240" height="135" align="left" /></a>
+
+Short screencast video on how to set up a subsite codebase.
+
 <details><p><summary>execute <code>./toolkit/phing build-subsite</code></summary></p>
 
 This build downloads and unpacks the latest released subsite deploy package and
@@ -108,4 +114,4 @@ This build will only build the files necessary for deployment. The result of the
 build will be compressed and uploaded to github when your project gets tagged
 for release. After the release this package will be available for download by
 the `./toolkit/phing build-subsite` command.
-</p></details>
+</p></details>

docs/docker-environment.md

@@ -2,8 +2,16 @@
 
 <big><table><thead><tr><th nowrap> [Using Git hooks](./git-hooks.md#using-git-hooks) </th><th width="100%" align="center"> [User guide](../README.md#user-guide) </th><th nowrap> [NextEuropa Toolkit](../README.md#nexteuropa-toolkit) </th></tr></thead></table>
 
-The toolkit allows comes with a docker environment that can help you set up an
-environment much faster. This feature is still experimental and in progress.
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=cwGZilB3BjQ
+" target="_blank"><img src="http://img.youtube.com/vi/cwGZilB3BjQ/0.jpg" 
+alt="Upgrade screencast" width="240" height="135" align="left" /></a>
+
+The toolkit comes with a docker environment that can help you set up your project
+much faster. This feature is still experimental and in progress. You can watch a
+very short screencast on how to use this docker environment. It makes use of a
+docker-compose.yml with custom FPFIS images. If
+[the provided docker-compose.yml](../includes/docker/docker-compose.yml)
+does meet your needs we advise you to customize it.
 
 ## How it works
 
@@ -61,4 +69,4 @@ Removing 5660526056154745951df82537e1f1cf_solr_1 ... done
 Removing 5660526056154745951df82537e1f1cf_mysql_1 ... done
 Removing network 5660526056154745951df82537e1f1cf_default
 ```
-</p></details>
+</p></details>

docs/setting-up-project.md

@@ -4,9 +4,16 @@
 
 ## Getting the sourcecode
 
-Before attempting to get the source code of a project please make sure you are
-familiar with the composer create-project command:
-https://getcomposer.org/doc/03-cli.md#create-project
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=REr4nGSAzco
+" target="_blank"><img src="http://img.youtube.com/vi/REr4nGSAzco/0.jpg" 
+alt="Upgrade screencast" width="240" height="135" align="left" /></a>
+
+You can watch a screencast on how get the source code of your project and install
+the toolkit or do both at the same time. Before attempting to composer only to get
+the source code for a project please make sure you are familiar with the
+[composer create-project command](https://getcomposer.org/doc/03-cli.md#create-project).
+Below we explain the difference between setting up a new project and setting up
+an existing project:
 
 ### New project
 To instatiate a new project that will be running as a subsite on the NextEuropa

docs/upgrading.md

@@ -2,7 +2,7 @@
 
 <a href="http://www.youtube.com/watch?feature=player_embedded&v=cwGZilB3BjQ
 " target="_blank"><img src="http://img.youtube.com/vi/cwGZilB3BjQ/0.jpg" 
-alt="Upgrade screencast" width="50%" align="left" /></a>
+alt="Upgrade screencast" width="240" height="135" align="left" /></a>
 
 This screencast explains how to upgrade a subsite-starterkit based project to
 the composer package based toolkit. To complete the upgrade you need to execute

includes/composer/composer.json

@@ -6,7 +6,7 @@
     "drupal/phingdrushtask": "^1.1",
     "drupol/phingbehattask": "^1.0",
     "drush/drush": "^8.0",
-    "ec-europa/backtrac-php-client": "~0.1.3",
+    "ec-europa/backtrac-php-client": "~0.1.8",
     "ext-json": "*",
     "ext-phar": "*",
     "ext-tidy": "^2.0",
@@ -100,6 +100,9 @@
     "bin-dir": "../../bin",
     "vendor-dir": "../../vendor",
     "discard-changes": true,
-    "process-timeout": 1200
+    "process-timeout": 1200,
+    "platform": {
+      "php": "5.6"
+    }
   }
 }