Some more changes for Docker

config/apache/Dockerfile

@@ -5,5 +5,8 @@ RUN a2enmod rewrite
 
 RUN docker-php-ext-install mysqli && docker-php-ext-enable mysqli
 
-# The php:apache image handles the "start" command automatically,
-# so we don't need to add anything else here.
+# Set Apache DocumentRoot to /var/wkvs/www
+ENV APACHE_DOCUMENT_ROOT /var/wkvs/www
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
+ && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \
+ && sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf

config/nginx/nginx.conf

@@ -4,8 +4,16 @@ http {
   server {
     listen 80;
 
+    location / {
+      proxy_pass http://apache:80;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
     location /ws/ {
-      proxy_pass http://127.0.0.1:8082;
+      proxy_pass http://node:8082;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "Upgrade";