diff --git a/apache2/Dockerfile b/apache2/Dockerfile index d15d0082..71cad501 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -5,10 +5,11 @@ LABEL maintainer="Eric Pfeiffer " ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 ARG PHP_UPSTREAM_TIMEOUT=60 +ARG DOCUMENT_ROOT=/var/www/ ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT} -ENV WEB_DOCUMENT_ROOT=/var/www/ +ENV WEB_DOCUMENT_ROOT=${DOCUMENT_ROOT} ENV WEB_PHP_TIMEOUT=${PHP_UPSTREAM_TIMEOUT} diff --git a/docker-compose.yml b/docker-compose.yml index 61a40eab..73231eeb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -173,6 +173,7 @@ services: - PHP_UPSTREAM_CONTAINER=${APACHE_PHP_UPSTREAM_CONTAINER} - PHP_UPSTREAM_PORT=${APACHE_PHP_UPSTREAM_PORT} - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT} + - DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT} volumes_from: - applications volumes: diff --git a/env-example b/env-example index 7be68b22..12ed88aa 100644 --- a/env-example +++ b/env-example @@ -147,6 +147,7 @@ APACHE_SITES_PATH=./apache2/sites APACHE_PHP_UPSTREAM_CONTAINER=php-fpm APACHE_PHP_UPSTREAM_PORT=9000 APACHE_PHP_UPSTREAM_TIMEOUT=60 +APACHE_DOCUMENT_ROOT=/var/www/ ### MYSQL ##############################################################################################################