Merge pull request #1142 from roelal/apache_socket_timeout

add APACHE_PHP_UPSTREAM_TIMEOUT

apache2/Dockerfile

@@ -4,11 +4,14 @@ MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
 
 ARG PHP_UPSTREAM_CONTAINER=php-fpm
 ARG PHP_UPSTREAM_PORT=9000
+ARG PHP_UPSTREAM_TIMEOUT=60
 
 ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}
 
 ENV WEB_DOCUMENT_ROOT=/var/www/
 
+ENV WEB_PHP_TIMEOUT=${PHP_UPSTREAM_TIMEOUT}
+
 EXPOSE 80 443
 
 WORKDIR /var/www/

docker-compose.yml

@@ -156,6 +156,7 @@ services:
         args:
           - PHP_UPSTREAM_CONTAINER=${APACHE_PHP_UPSTREAM_CONTAINER}
           - PHP_UPSTREAM_PORT=${APACHE_PHP_UPSTREAM_PORT}
+          - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT}
       volumes_from:
         - applications
       volumes:

env-example

@@ -97,6 +97,7 @@ APACHE_HOST_LOG_PATH=./logs/apache2
 APACHE_SITES_PATH=./apache2/sites
 APACHE_PHP_UPSTREAM_CONTAINER=php-fpm
 APACHE_PHP_UPSTREAM_PORT=9000
+APACHE_PHP_UPSTREAM_TIMEOUT=60
 
 ### MYSQL ##############################################################################################################