diff --git a/apache2/Dockerfile b/apache2/Dockerfile index e2b4ce41..9d4d9a9a 100644 --- a/apache2/Dockerfile +++ b/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"] diff --git a/apache2/sites/default.apache.conf b/apache2/sites/default.apache.conf index 2d15dafc..5cedafb6 100644 --- a/apache2/sites/default.apache.conf +++ b/apache2/sites/default.apache.conf @@ -1,9 +1,9 @@ ServerName laradock.dev - DocumentRoot /var/www/html/ + DocumentRoot /var/www/public/ Options Indexes FollowSymLinks - + AllowOverride All Allow from all