From 2af40b0ba107a86b57710226fb3b2c29b309f164 Mon Sep 17 00:00:00 2001
From: Mahmoud Zalt <mahmoud@zalt.me>
Date: Fri, 4 Aug 2017 00:51:20 +0300
Subject: [PATCH] fix #970. remove the required public directory in the
 /var/www

---
 apache2/Dockerfile                | 4 ++--
 apache2/sites/default.apache.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apache2/Dockerfile b/apache2/Dockerfile
index afbb7c2b..bc152dd3 100644
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@@ -7,11 +7,11 @@ ARG PHP_UPSTREAM_PORT=9000
 
 ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}
 
-ENV WEB_DOCUMENT_ROOT=/var/www/public/
+ENV WEB_DOCUMENT_ROOT=/var/www/
 
 EXPOSE 80 443
 
-WORKDIR /var/www/public/
+WORKDIR /var/www/
 
 COPY vhost.conf /etc/apache2/sites-enabled/vhost.conf
 
diff --git a/apache2/sites/default.apache.conf b/apache2/sites/default.apache.conf
index 5cedafb6..18ee6de5 100644
--- a/apache2/sites/default.apache.conf
+++ b/apache2/sites/default.apache.conf
@@ -1,9 +1,9 @@
 <VirtualHost *:80>
   ServerName laradock.dev
-  DocumentRoot /var/www/public/
+  DocumentRoot /var/www/
   Options Indexes FollowSymLinks
 
-  <Directory "/var/www/public/">
+  <Directory "/var/www/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all