Refactored main container (overall provisioning)

Author: mblaschke

docker-compose.yml

@@ -8,11 +8,8 @@ main:
   dockerfile: Ubuntu-14.04 # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
   #dockerfile: Ubuntu-15.04 # Ubuntu 15.04 - PHP 5.6 (vivid)
   #dockerfile: Ubuntu-15.10 # Ubuntu 15.10 - PHP 5.6 (wily)
-
-  ## CentOS
-  #build: docker/main/centos
-  #dockerfile: docker/main/centos/Centos-7     # CentOS 7     - PHP 5.4
-  #dockerfile: docker/main/ubuntu-hhvm # ubuntu lts with HHVM   (ansible provisioning)
+  #dockerfile: Ubuntu-HHVM  # Ubuntu 14.04 - HHVM (trusty)
+  #dockerfile: Centos-7     # CentOS 7     - PHP 5.4
   links:
     - mysql
     #- postgres