Merge with master branch

This commit is contained in:
ZeroC0D3 Team committed 2017-03-17 14:36:00 +07:00
1 parent 8de9eca8ae
commit 5c0933d19a
87 files changed
+1966 -1705

No files matched your search

+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/
ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]