diff --git a/apache2/Dockerfile b/apache2/Dockerfile index bc152dd3..9624d975 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -4,11 +4,14 @@ MAINTAINER Eric Pfeiffer 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/ diff --git a/docker-compose.yml b/docker-compose.yml index 4fe71545..b44e8b77 100644 --- a/docker-compose.yml +++ b/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: diff --git a/env-example b/env-example index 34670e71..7357b3ef 100644 --- a/env-example +++ b/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 ##############################################################################################################