[TASK] Make document root configurable

.env

@@ -4,4 +4,5 @@ MYSQL_USER=neos
 MYSQL_PASSWORD=neos
 
 FLOW_CONTEXT=Development/Docker
-NGINX_PORT=1234
+NGINX_PORT=1234
+NGINX_DOCUMENT_ROOT=/data/Web

Docker/nginx/default.conf.template

@@ -1,7 +1,7 @@
 server {
     listen ${NGINX_PORT};
     server_name localhost;
-    root /data/Web;
+    root ${NGINX_DOCUMENT_ROOT};
     index index.php;
 
     client_body_temp_path /tmp/nginx;

Docker/nginx/run_nginx.sh

@@ -3,5 +3,5 @@
 set -e
 set -u
 
-envsubst '${FLOW_CONTEXT} ${NGINX_PORT}' < /default.conf.template > /etc/nginx/conf.d/default.conf
+envsubst '${FLOW_CONTEXT} ${NGINX_PORT} ${NGINX_DOCUMENT_ROOT}' < /default.conf.template > /etc/nginx/conf.d/default.conf
 nginx -g "daemon off;"

README.md

@@ -62,4 +62,4 @@ If you want a different port than 1234 you can edit the environment variable `NG
 
 ### How to change the document root? 
 
-To change the document root just edit the configuration file located under `Docker/nginx/default.conf.template`
+To change the document root just edit the environment variable `NGINX_DOCUMENT_ROOT` in the [.env](https://github.com/egobude/docker-neos-template/blob/master/.env) file.

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
       FLOW_CONTEXT: "${FLOW_CONTEXT}"
     volumes:
-      - "./Data:/data:cached"
+      - "./Data:/data"
 
   nginx:
     build: ./Docker/nginx
@@ -21,9 +21,10 @@ services:
     environment:
       FLOW_CONTEXT: "${FLOW_CONTEXT}"
       NGINX_PORT: "${NGINX_PORT}"
+      NGINX_DOCUMENT_ROOT: "${NGINX_DOCUMENT_ROOT}"
     command: /bin/sh -c "/run_nginx.sh"
-    volumes:
-      - "./Data:/data"
+    volumes_from:
+      - php
 
   redis:
      build: ./Docker/redis