diff --git a/Dockerfile b/Dockerfile index 255c010..56cf363 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,9 +65,10 @@ RUN mkdir -p bootstrap/cache storage/framework/views storage/framework/cache sto COPY docker/nginx.conf /etc/nginx/http.d/default.conf COPY docker/supervisord.conf /etc/supervisor.conf -COPY docker/www.conf /usr/local/etc/php-fpm.d/www.conf -RUN echo "* * * * * php /app/artisan schedule:run >> /dev/null 2>&1" > /etc/crontabs/www-data +RUN php-fpm -t \ + && nginx -t \ + && echo "* * * * * php /app/artisan schedule:run >> /dev/null 2>&1" > /etc/crontabs/www-data EXPOSE 80 diff --git a/docker/nginx.conf b/docker/nginx.conf index 0aba602..c6f177a 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -1,3 +1,5 @@ +error_log /dev/stderr warn; + server { listen 80; server_name _; @@ -21,13 +23,10 @@ server { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_index index.php; include fastcgi_params; + fastcgi_param APP_ENV production; } location ~ /\.(?!well-known).* { deny all; } - - location ~ \.css\.map$ { - deny all; - } } diff --git a/docker/www.conf b/docker/www.conf deleted file mode 100644 index 1d96636..0000000 --- a/docker/www.conf +++ /dev/null @@ -1,18 +0,0 @@ -[www] -user = www-data -group = www-data -listen = 127.0.0.1:9000 -listen.owner = www-data -listen.group = www-data -listen.mode = 0660 -pm = dynamic -pm.max_children = 10 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -pm.max_requests = 500 -clear_env = no -catch_workers_output = yes -php_admin_flag[display_errors] = off -php_admin_flag[log_errors] = on -php_admin_value[error_log] = /proc/self/fd/2