Merge pull request #13 from drupal-docker/unified-structure

Unified file structure

Author: zaporylie

.travis.yml

@@ -5,18 +5,18 @@ services:
 
 env:
   matrix:
-    - DOCKERFILE="apache/5.4"
-    - DOCKERFILE="apache/5.5"
-    - DOCKERFILE="apache/5.6"
-    - DOCKERFILE="apache/7"
-    - DOCKERFILE="fpm/5.4"
-    - DOCKERFILE="fpm/5.5"
-    - DOCKERFILE="fpm/5.6"
-    - DOCKERFILE="fpm/7"
-    - DOCKERFILE="cli/5.4"
-    - DOCKERFILE="cli/5.5"
-    - DOCKERFILE="cli/5.6"
-    - DOCKERFILE="cli/7"
+    - DOCKERFILE="5.4"
+    - DOCKERFILE="5.4/apache"
+    - DOCKERFILE="5.4/fpm"
+    - DOCKERFILE="5.5"
+    - DOCKERFILE="5.5/apache"
+    - DOCKERFILE="5.5/fpm"
+    - DOCKERFILE="5.6"
+    - DOCKERFILE="5.6/apache"
+    - DOCKERFILE="5.6/fpm"
+    - DOCKERFILE="7.0"
+    - DOCKERFILE="7.0/apache"
+    - DOCKERFILE="7.0/fpm"
 
 before_script:
   - docker version
@@ -26,4 +26,3 @@ script:
 
 after_script:
   - docker images
-  - docker ps -a