blackbirdchess
/
blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing apache webroot issue #849

This commit is contained in:
Winfried 2017-05-01 12:41:55 +02:00
parent 8246863cd7
commit 1be9df7d61
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2/Dockerfile
View File

@ -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"]

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

@ -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