Merge pull request #1438 from pangminfu/apache-docroot-path
Apache document root path configurable with env file
This commit is contained in:
commit
871a9d032a
|
@ -5,10 +5,11 @@ LABEL maintainer="Eric Pfeiffer <computerfr33k@users.noreply.github.com>"
|
|||
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}
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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 ##############################################################################################################
|
||||
|
||||
|
|
Loading…
Reference in New Issue