Merge branch 'develop' into fix/add-label-to-network

Author: thrijith

.travis.yml

@@ -8,7 +8,8 @@ env:
     - TEST_COMMAND=$(echo $TRAVIS_REPO_SLUG | cut -d/ -f 2) # Get command name to be tested
 
 before_script:
-  - |
+   - sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+   - |
     # Remove Xdebug for a huge performance increase:
     if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
       phpenv config-rm xdebug.ini
@@ -33,3 +34,8 @@ notifications:
   email:
     on_success: never
     on_failure: change
+
+addons:
+  apt:
+    packages:
+      - docker-ce

templates/docker-compose.mustache

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.5'
 
 services:
 
@@ -48,6 +48,7 @@ services:
 {{#network}}
 networks:
   site-network:
+    name: ${VIRTUAL_HOST}
     {{#networks_labels}}
     labels:
     {{#label}}