ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added NGINX from env file and updated env-example

This commit is contained in:
Marius van Zundert 2017-02-27 14:11:16 +01:00
parent c112fdffc1
commit 356dc36fd5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -83,8 +83,8 @@ services:
volumes_from: volumes_from:
- applications - applications
volumes: volumes:
- ./logs/nginx/:/var/log/nginx - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
- ./nginx/sites/:/etc/nginx/sites-available - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"

5
env-example
View File

@ -39,7 +39,6 @@ WORKSPACE_NODE_VERSION=stable
WORKSPACE_TIMEZONE=UTC WORKSPACE_TIMEZONE=UTC
WORKSPACE_SSH_PORT=2222 WORKSPACE_SSH_PORT=2222
# PHP_FPM # PHP_FPM
PHP_FPM_DOCKER_FILE=Dockerfile-70 PHP_FPM_DOCKER_FILE=Dockerfile-70
PHP_FPM_INSTALL_XDEBUG=false PHP_FPM_INSTALL_XDEBUG=false
@ -55,11 +54,11 @@ PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
PHP_FPM_CODEIGNITER=falses PHP_FPM_CODEIGNITER=falses
# NGINX # NGINX
NGINX_BUILD_PATH=./nginx
NGINX_CONTAINER_NAME=nginx
NGINX_HOST_HTTP_PORT=8080 NGINX_HOST_HTTP_PORT=8080
NGINX_HOST_HTTPS_PORT=8433 NGINX_HOST_HTTPS_PORT=8433
NGINX_HOST_LOG_PATH=./logs/nginx/ NGINX_HOST_LOG_PATH=./logs/nginx/
NGINX_SITES_PATH=./nginx/sites/
# APACHE # APACHE