Merge branch 'master' into add_apache_vhost_conf

This commit is contained in:
g9308370
2017-03-17 16:37:59 +08:00
committed by GitHub
90 changed files with 2280 additions and 1832 deletions

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