Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
871a9d03
Unverified
Commit
871a9d03
authored
Mar 25, 2018
by
Mahmoud Zalt
Committed by
GitHub
Mar 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1438 from pangminfu/apache-docroot-path
Apache document root path configurable with env file
parents
805d7f94
f810962d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
Dockerfile
apache2/Dockerfile
+2
-1
docker-compose.yml
docker-compose.yml
+1
-0
env-example
env-example
+1
-0
No files found.
apache2/Dockerfile
View file @
871a9d03
...
...
@@ -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}
...
...
docker-compose.yml
View file @
871a9d03
...
...
@@ -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
:
...
...
env-example
View file @
871a9d03
...
...
@@ -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 ##############################################################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment