ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #970. remove the required public directory in the /var/www

This commit is contained in:
Mahmoud Zalt 2017-08-04 00:51:20 +03:00
parent 5c0b8316b1
commit 2af40b0ba1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache2/Dockerfile
View File

@ -7,11 +7,11 @@ ARG PHP_UPSTREAM_PORT=9000
ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT} 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 EXPOSE 80 443
WORKDIR /var/www/public/ WORKDIR /var/www/
COPY vhost.conf /etc/apache2/sites-enabled/vhost.conf COPY vhost.conf /etc/apache2/sites-enabled/vhost.conf

4
apache2/sites/default.apache.conf
View File

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