Skip to content

L
laradock
Commit 2af40b0b authored by Mahmoud Zalt's avatar Mahmoud Zalt
Browse files
Options

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

parent 5c0b8316
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
apache2/Dockerfile
View file @ 2af40b0b
...@@ -7,11 +7,11 @@ ARG PHP_UPSTREAM_PORT=9000 ...@@ -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
......
apache2/sites/default.apache.conf
View file @ 2af40b0b
<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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment