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

Merge branch 'master' into add_apache_vhost_conf

Browse Source
This commit is contained in:
g9308370 authored and GitHub committed 2017-03-17 16:37:59 +08:00
2 parents 37ed904f1a 9ae6e45dda
commit badad156e1
90 files changed
+2280 -1832
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apache2/Dockerfile
+2 -2
View File
@@ -6,11 +6,11 @@ ARG PHP_SOCKET=php-fpm:9000
ENV WEB_PHP_SOCKET=$PHP_SOCKET
ENV WEB_DOCUMENT_ROOT=/var/www/public
ENV WEB_DOCUMENT_ROOT=/var/www/
EXPOSE 80 443
WORKDIR /var/www/public
WORKDIR /var/www/
ADD vhost.conf /etc/apache2/sites-enabled/vhost.conf