浏览代码

Added NGINX from env file and updated env-example

Marius van Zundert 8 年之前
父节点
当前提交
356dc36fd5
共有 2 个文件被更改,包括 5 次插入6 次删除
  1. 3 3
      docker-compose.yml
  2. 2 3
      env-example

+ 3 - 3
docker-compose.yml

@@ -82,9 +82,9 @@ services:
                 - PHP_UPSTREAM=php-fpm
         volumes_from:
             - applications
-        volumes:
-            - ./logs/nginx/:/var/log/nginx
-            - ./nginx/sites/:/etc/nginx/sites-available
+        volumes:            
+            - ${NGINX_HOST_LOG_PATH}:/var/log/nginx
+            - ${NGINX_SITES_PATH}:/etc/nginx/sites-available
         ports:
             - "80:80"
             - "443:443"

+ 2 - 3
env-example

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