Merge pull request #51 from bryanlatten/feature-back-to-root

Nginx: running master process back at root

Author: bryanlatten

container/root/etc/cont-init.d/01-stdout.sh

@@ -7,8 +7,8 @@
 # add to the /etc/cont-init.d/nginx script
 #############################################################
 
-# Only set when running with superuser permissions, otherwise causes a warning
-# user www-data;
+# Running workers as non-root users
+user www-data;
 
 worker_processes auto;
 

container/root/etc/fix-attrs.d/02-tmp

@@ -15,4 +15,4 @@ trap -x
   }
 }
 
-s6-setuidgid www-data nginx -g "daemon off;"
+nginx -g "daemon off;"

container/root/etc/nginx/nginx.conf

@@ -4,7 +4,7 @@ ubuntu:
    - '8080:8080'
   environment:
     SERVER_LOG_MINIMAL: 1
-    SERVER_APP_NAME: docker-test
+    SERVER_APP_NAME: docker-ubuntu
     S6_KILL_FINISH_MAXTIME: 1
     S6_KILL_GRACETIME: 1
     SERVER_WORKER_PROCESSES: 1
@@ -21,7 +21,7 @@ alpine:
    - '8081:8080'
   environment:
     SERVER_LOG_MINIMAL: 1
-    SERVER_APP_NAME: docker-test
+    SERVER_APP_NAME: docker-alpine
     S6_KILL_FINISH_MAXTIME: 1
     S6_KILL_GRACETIME: 1
     SERVER_WORKER_PROCESSES: 1