From e694254fb04e9bad1c28f7866435cc7a88ffafbd Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:34:15 +0800 Subject: [PATCH 1/3] WEB_DOCUMENT_ROOT accept argument DOCUMENT_ROOT with original default value /var/www/ --- apache2/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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} From f5f23bed1bdd0bd1547aac8a35e7bc2998c67c2f Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:37:21 +0800 Subject: [PATCH 2/3] apache2 accept APACHE_DOCUMENT_ROOT argument from .env file --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 13175283..839aef1b 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: From f810962d84245cdab47a8f08973db277af09d5b2 Mon Sep 17 00:00:00 2001 From: mfpang Date: Sun, 18 Mar 2018 17:38:49 +0800 Subject: [PATCH 3/3] add APACHE_DOCUMENT_ROOT in env-example file --- env-example | 1 + 1 file changed, 1 insertion(+) 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 ##############################################################################################################