Switched nginx master process to root.

adivinho · Sep 12, 2016 · ee760fc · ee760fc
1 parent 276c58c
commit ee760fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -58,10 +58,7 @@ RUN curl -s -LO https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_linux_a
 # ##### #
 
 COPY nginx.conf nginx-ssl.conf /etc/nginx/
-RUN touch /etc/nginx/.htpasswd && \
-	touch /run/nginx.pid && \
-	chown -R www-data:www-data /var/lib/nginx /run/nginx.pid && \
-	setcap cap_net_bind_service=+ep /usr/sbin/nginx
+RUN touch /etc/nginx/.htpasswd
 
 # ########################### #
 # Supervisor and landing page # 

diff --git a/nginx.conf b/nginx.conf
@@ -1,3 +1,4 @@
+user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
 daemon off;

diff --git a/supervisord.conf b/supervisord.conf
@@ -44,7 +44,6 @@ autorestart = true
 
 [program:nginx]
 priority = 4
-user = www-data
 command = nginx
 stdout_logfile = /var/log/nginx.log
 stderr_logfile = /var/log/nginx.log