Added configurable PHP options to ./etc/PHP/

docker-compose.yml

@@ -19,6 +19,7 @@ services:
     volumes:
       - ./sites:/var/www
       - apache_logs:/var/log/apache2
+      - ./etc/PHP/docker.ini:/etc/php/5.6/conf.d/docker.ini
 
   # Database server
   db:

etc/PHP/docker.ini

@@ -0,0 +1,16 @@
+##
+# Docker Drupal Development
+#
+# Override default PHP options
+
+# Turn on all error reporting
+error_reporting = E_ALL
+display_errors = On
+log_errors = On
+
+# Increase resource limits
+max_execution_time = 300
+memory_limit = 512M
+upload_max_filesize = 32M
+post_max_size = 32M
+max_input_vars = 10000

images/apache2_php5/Dockerfile

@@ -3,7 +3,7 @@
 #
 # Drupal web server container
 
-FROM ddd/apache2
+FROM dockerdrupaldev/apache2
 
 LABEL maintainer="[email protected]"
 ENV DEBIAN_FRONTEND noninteractive
@@ -38,10 +38,10 @@ RUN locale-gen en_US.UTF-8 && \
     apt-get clean
 
 # Configure PHP
-COPY config/php/docker.ini /etc/php/5.6/mods-available/docker.ini
+COPY config/php/docker.ini /etc/php/5.6/conf.d/docker.ini
 COPY config/php/xdebug.ini /etc/php/5.6/mods-available/xdebug.ini
 RUN phpenmod xdebug && \
-    ln -s /etc/php/5.6/mods-available/docker.ini /etc/php/5.6/apache2/conf.d/90-docker.ini
+    ln -s /etc/php/5.6/conf.d/docker.ini /etc/php/5.6/apache2/conf.d/90-docker.ini
 
 EXPOSE 80 443
 

images/apache2_php7/Dockerfile

@@ -3,7 +3,7 @@
 #
 # Drupal web server container
 
-FROM ddd/apache2
+FROM dockerdrupaldev/apache2
 
 LABEL maintainer="[email protected]"
 ENV DEBIAN_FRONTEND noninteractive
@@ -35,12 +35,12 @@ RUN apt-get update && \
     apt-get clean
 
 # Configure PHP
-COPY config/php/docker.ini /etc/php/7.0/mods-available/docker.ini
+COPY config/php/docker.ini /etc/php/7.0/conf.d/docker.ini
 COPY config/php/xdebug.ini /etc/php/7.0/mods-available/xdebug.ini
 RUN phpenmod imap && \
     phpenmod mcrypt && \
     phpenmod xdebug && \
-    ln -s /etc/php/7.0/mods-available/docker.ini /etc/php/7.0/apache2/conf.d/90-docker.ini
+    ln -s /etc/php/7.0/conf.d/docker.ini /etc/php/7.0/apache2/conf.d/90-docker.ini
 
 EXPOSE 80 443
 

php7.yml

@@ -9,6 +9,8 @@ services:
   # Drupal web server with PHP 7
   web:
     image: dockerdrupaldev/apache2-php7:latest
+    volumes:
+      - ./etc/PHP/docker.ini:/etc/php/7.0/conf.d/docker.ini
 
   # CLI development tools with SSH and PHP 7
   cli_tools: