Merge pull request #124 from bryanlatten/non-root-master

FPM: reverting master process back to root

Dockerfile

@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:7.0
+FROM behance/docker-nginx:8.0
 MAINTAINER Bryan Latten <[email protected]>
 
 # Set TERM to suppress warning messages.

container/root/etc/services-available/php-fpm/run

@@ -29,4 +29,4 @@ trap
 
 # PHP-FPM needs to have stdout/stderr filtered for the extra "cruft" it appends.
 # Due to the complexity of this script (it didn't work with S6's pipeline), it is now moved to its own separate script
-s6-setuidgid www-data with-contenv ./.command
+with-contenv ./.command

container/root/prep-php.sh

@@ -33,8 +33,8 @@ sed -i "s/;catch_workers_output.*/catch_workers_output = yes/" $CONF_FPMPOOL
 sed -i "s/;listen.allowed_clients.*/listen.allowed_clients = 127.0.0.1/" $CONF_FPMPOOL
 
 # - Since PHP-FPM will be run without root privileges, comment these lines to prevent any startup warnings
-sed -i "s/^user =/;user =/" $CONF_FPMPOOL
-sed -i "s/^group =/;group =/" $CONF_FPMPOOL
+# sed -i "s/^user =/;user =/" $CONF_FPMPOOL
+# sed -i "s/^group =/;group =/" $CONF_FPMPOOL
 
 # - Match FPM timeout directive with .ini max execution time
 sed -i "s/;*request_terminate_timeout = .*/request_terminate_timeout = \${PHP_FPM_MAX_EXECUTION_TIME}/" $CONF_FPMPOOL

container/root/tests/php-fpm/beta.goss.yaml

@@ -66,8 +66,8 @@ file:
       - '/^clear_env = no/'
       - '/^catch_workers_output = yes/'
       - '/^listen.allowed_clients = 127.0.0.1/'
-      - '/^;user =/'
-      - '/^;group =/'
+      # - '/^;user =/'
+      # - '/^;group =/'
       - '/^request_terminate_timeout = \${PHP_FPM_MAX_EXECUTION_TIME}/'
       - '/^rlimit_files = 40000/'
       - '/^rlimit_core = unlimited/'

container/root/tests/php-fpm/legacy.goss.yaml

@@ -69,8 +69,8 @@ file:
       - '/^clear_env = no/'
       - '/^catch_workers_output = yes/'
       - '/^listen.allowed_clients = 127.0.0.1/'
-      - '/^;user =/'
-      - '/^;group =/'
+      # - '/^;user =/'
+      # - '/^;group =/'
       - '/^request_terminate_timeout = \${PHP_FPM_MAX_EXECUTION_TIME}/'
       - '/^rlimit_files = 40000/'
       - '/^rlimit_core = unlimited/'

container/root/tests/php-fpm/ubuntu.goss.yaml

@@ -92,8 +92,8 @@ file:
       - '/^clear_env = no/'
       - '/^catch_workers_output = yes/'
       - '/^listen.allowed_clients = 127.0.0.1/'
-      - '/^;user =/'
-      - '/^;group =/'
+      # - '/^;user =/'
+      # - '/^;group =/'
       - '/^request_terminate_timeout = \${PHP_FPM_MAX_EXECUTION_TIME}/'
       - '/^rlimit_files = 40000/'
       - '/^rlimit_core = unlimited/'