Merge pull request #58 from drupal-docker/improve-structure

Improve structure

Author: zaporylie

.travis.yml

@@ -5,33 +5,34 @@ services:
 
 env:
   matrix:
-    - 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"
-    - DOCKERFILE="7.1"
-    - DOCKERFILE="7.1/apache"
-    - DOCKERFILE="7.1/fpm"
-    - DOCKERFILE="5.6-alpine"
-    - DOCKERFILE="5.6-alpine/fpm"
-    - DOCKERFILE="7.0-alpine"
-    - DOCKERFILE="7.0-alpine/fpm"
-    - DOCKERFILE="7.1-alpine"
-    - DOCKERFILE="7.1-alpine/fpm"
+    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.4"
+    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.4"
+    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.4"
+    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.5"
+    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.5"
+    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.5"
+    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6"
+    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.6"
+    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6"
+    - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="5.6"
+    - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="5.6"
+    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.0"
+    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.0"
+    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.0"
+    - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.0"
+    - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.0"
+    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.1"
+    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.1"
+    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1"
+    - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.1"
+    - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.1"
 
 before_script:
   - docker version
 
 script:
-  - docker build -t ${DOCKERFILE} ./${DOCKERFILE}
+  - docker build -f ./${DOCKERPATH}/${DOCKERFILE} -t ${DOCKERPATH} ./${DOCKERPATH}
 
 after_script:
   - docker images
+  - docker run --rm -ti ${DOCKERPATH} php -i

5.4/apache/Dockerfile 5.4/Dockerfile-apache5.4/apache/Dockerfile renamed to 5.4/Dockerfile-apache

@@ -15,3 +15,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
   && rm -rf /var/lib/apt/lists/*
 
 COPY drupal-*.ini /usr/local/etc/php/conf.d/
+COPY cli/drupal-*.ini /usr/local/etc/php/conf.d/

5.4/Dockerfile 5.4/Dockerfile-cli5.4/Dockerfile renamed to 5.4/Dockerfile-cli

@@ -0,0 +1,3 @@
+allow_url_fopen = On
+display_errors = On
+memory_limit = -1

5.4/fpm/Dockerfile 5.4/Dockerfile-fpm5.4/fpm/Dockerfile renamed to 5.4/Dockerfile-fpm

@@ -1,8 +1,8 @@
 session.cache_limiter = nocache
 session.auto_start = 0
 expose_php = Off
-allow_url_fopen = On
+allow_url_fopen = Off
 register_globals = Off
-display_errors = On
-memory_limit = -1
+display_errors = Off
+memory_limit = 512M
 date.timezone = "UTC"

5.4/apache/drupal-00.ini

@@ -16,3 +16,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
   && rm -rf /var/lib/apt/lists/*
 
 COPY drupal-*.ini /usr/local/etc/php/conf.d/
+COPY cli/drupal-*.ini /usr/local/etc/php/conf.d/