Browse Source

Fixing apache webroot issue #849

Winfried 8 years ago
parent
commit
1be9df7d61
2 changed files with 5 additions and 5 deletions
  1. 3 3
      apache2/Dockerfile
  2. 2 2
      apache2/sites/default.apache.conf

+ 3 - 3
apache2/Dockerfile

@@ -6,13 +6,13 @@ ARG PHP_SOCKET=php-fpm:9000
 
 ENV WEB_PHP_SOCKET=$PHP_SOCKET
 
-ENV WEB_DOCUMENT_ROOT=/var/www/
+ENV WEB_DOCUMENT_ROOT=/var/www/public/
 
 EXPOSE 80 443
 
-WORKDIR /var/www/
+WORKDIR /var/www/public/
 
-ADD vhost.conf /etc/apache2/sites-enabled/vhost.conf
+COPY vhost.conf /etc/apache2/sites-enabled/vhost.conf
 
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 

+ 2 - 2
apache2/sites/default.apache.conf

@@ -1,9 +1,9 @@
 <VirtualHost *:80>
   ServerName laradock.dev
-  DocumentRoot /var/www/html/
+  DocumentRoot /var/www/public/
   Options Indexes FollowSymLinks
 
-  <Directory "/var/www/html/">
+  <Directory "/var/www/public/">
     AllowOverride All
     <IfVersion < 2.4>
       Allow from all