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

re-added www-data user for nginx. log to stdout.

This commit is contained in:
Eric Pfeiffer 2016-07-26 12:41:52 -05:00
parent ed8e241007
commit e6cf30e7ba
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nginx/Dockerfile
View File

@ -5,9 +5,13 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
ADD nginx.conf /etc/nginx/ ADD nginx.conf /etc/nginx/
ADD laravel.conf /etc/nginx/conf.d/laravel.conf ADD laravel.conf /etc/nginx/conf.d/laravel.conf
ARG PHP_UPSTREAM ARG PHP_UPSTREAM=php-fpm
RUN rm /etc/nginx/conf.d/default.conf \ RUN apk update \
&& apk upgrade \
&& apk add --no-cache bash \
&& adduser -D -H -u 1000 -s /bin/bash www-data \
&& rm /etc/nginx/conf.d/default.conf \
&& echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
CMD ["nginx"] CMD ["nginx"]

5
nginx/nginx.conf
View File

@ -1,3 +1,4 @@
user www-data;
worker_processes 4; worker_processes 4;
pid /run/nginx.pid; pid /run/nginx.pid;
daemon off; daemon off;
@ -18,8 +19,8 @@ http {
client_max_body_size 20M; client_max_body_size 20M;
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;
access_log on; access_log /dev/stdout;
error_log on; error_log /dev/stderr;
gzip on; gzip on;
gzip_disable "msie6"; gzip_disable "msie6";
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;