Merge pull request #103 from bryanlatten/overrides-env

Dockerfile: step 2 towards non-writable FS

Author: bryanlatten

Dockerfile

@@ -12,6 +12,9 @@ ENV CONF_PHPFPM=/etc/php/7.0/fpm/php-fpm.conf \
     PHP_FPM_MAX_REQUESTS=1024 \
     PHP_FPM_MIN_SPARE_SERVERS=5 \
     PHP_FPM_MAX_SPARE_SERVERS=128 \
+    PHP_FPM_MEMORY_LIMIT=256M \
+    PHP_FPM_MAX_EXECUTION_TIME=60 \
+    PHP_FPM_UPLOAD_MAX_FILESIZE=1M \
     NEWRELIC_VERSION=6.7.0.174
 
 # Ensure cleanup script is available for the next command
@@ -109,6 +112,8 @@ RUN sed -i "s/listen = .*/listen = 127.0.0.1:9000/" $CONF_FPMPOOL && \
     sed -i "s/newrelic.daemon.logfile = .*/newrelic.daemon.logfile = \"\/dev\/stdout\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i "s/;newrelic.loglevel = .*/newrelic.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i "s/;newrelic.daemon.loglevel = .*/newrelic.daemon.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
+    # 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 && \
     # Required for php-fpm to place .sock file into, fails otherwise \
     mkdir /var/run/php/ && \
     chown -R $NOT_ROOT_USER:$NOT_ROOT_USER /var/run/php /var/run/lock /var/log/newrelic

Dockerfile-alpine

@@ -12,6 +12,9 @@ ENV CONF_PHPFPM=/etc/php7/php-fpm.conf \
     PHP_FPM_MAX_REQUESTS=1024 \
     PHP_FPM_MIN_SPARE_SERVERS=5 \
     PHP_FPM_MAX_SPARE_SERVERS=128 \
+    PHP_FPM_MEMORY_LIMIT=256M \
+    PHP_FPM_MAX_EXECUTION_TIME=60 \
+    PHP_FPM_UPLOAD_MAX_FILESIZE=1M \
     NEWRELIC_VERSION=6.7.0.174
 
 RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
@@ -133,6 +136,8 @@ RUN sed -i "s/listen = .*/listen = 127.0.0.1:9000/" $CONF_FPMPOOL && \
     sed -i "s/;newrelic.loglevel = .*/newrelic.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i "s/;newrelic.daemon.loglevel = .*/newrelic.daemon.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i 's/extension\s\?=/;extension =/' $CONF_PHPMODS/newrelic.ini && \
+    # 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 && \
     # Required for php-fpm to place .sock file into, fails otherwise \
     mkdir -p /var/run/php/ /var/log/php7/newrelic && \
     chown -R $NOT_ROOT_USER:$NOT_ROOT_USER /var/run/php /var/log/newrelic

Dockerfile-edge

@@ -12,6 +12,9 @@ ENV CONF_PHPFPM=/etc/php/7.1/fpm/php-fpm.conf \
     PHP_FPM_MAX_REQUESTS=1024 \
     PHP_FPM_MIN_SPARE_SERVERS=5 \
     PHP_FPM_MAX_SPARE_SERVERS=128 \
+    PHP_FPM_MEMORY_LIMIT=256M \
+    PHP_FPM_MAX_EXECUTION_TIME=60 \
+    PHP_FPM_UPLOAD_MAX_FILESIZE=1M \
     NEWRELIC_VERSION=6.7.0.174
 
 # Ensure cleanup script is available for the next command
@@ -113,6 +116,8 @@ RUN sed -i "s/listen = .*/listen = 127.0.0.1:9000/" $CONF_FPMPOOL && \
     sed -i "s/newrelic.daemon.logfile = .*/newrelic.daemon.logfile = \"\/dev\/stdout\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i "s/;newrelic.loglevel = .*/newrelic.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
     sed -i "s/;newrelic.daemon.loglevel = .*/newrelic.daemon.loglevel = \"warning\"/" $CONF_PHPMODS/newrelic.ini && \
+    # 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 && \
     # Required for php-fpm to place .sock file into, fails otherwise \
     mkdir /var/run/php/ && \
     chown -R $NOT_ROOT_USER:$NOT_ROOT_USER /var/run/php /var/run/lock /var/log/newrelic

container/root/etc/cont-init.d/09-php-fpm.sh

@@ -1,8 +1,9 @@
 ; Use this file to override specific defaults in the stock php.ini
-; NOTE: this only applies to web requests through FPM, not direct or CLI PHP instantiations
+; NOTE: this file only applies to web requests through FPM, not direct or CLI PHP instantiations
 
-memory_limit = 192M
-max_execution_time = 60
-request_terminate_timeout = 60
-upload_max_filesize = 1M
-post_max_size = 1M
+memory_limit = ${PHP_FPM_MEMORY_LIMIT}
+max_execution_time = ${PHP_FPM_MAX_EXECUTION_TIME}
+
+; Important: next two values should match in order to raise upload limits
+upload_max_filesize = ${PHP_FPM_UPLOAD_MAX_FILESIZE}
+post_max_size = ${PHP_FPM_UPLOAD_MAX_FILESIZE}

container/root/etc/php/7.0/fpm/conf.d/overrides.user.ini

@@ -21,5 +21,6 @@ then
     echo '[run] adding FPM-specific overrides: Alpine-only'
     ln -s $CONF_FPMOVERRIDES /etc/php7/conf.d/overrides.user.ini
   fi
-
+else
+  echo '[run] non-web mode, bypassing FPM startup'
 fi

container/root/run.d/09-php-fpm.sh

@@ -5,7 +5,7 @@ ubuntu:
   environment:
     CFG_APP_DEBUG: 1
     SERVER_LOG_MINIMAL: 1
-    PHP_FPM_MEMORY_LIMIT: 256M
+    PHP_FPM_MEMORY_LIMIT: 257M
     PHP_FPM_MAX_EXECUTION_TIME: 61
     PHP_FPM_UPLOAD_MAX_FILESIZE: 100M
     SERVER_MAX_BODY_SIZE: 100M
@@ -26,7 +26,7 @@ alpine:
   environment:
     CFG_APP_DEBUG: 1
     SERVER_LOG_MINIMAL: 1
-    PHP_FPM_MEMORY_LIMIT: 256M
+    PHP_FPM_MEMORY_LIMIT: 257M
     PHP_FPM_MAX_EXECUTION_TIME: 61
     PHP_FPM_UPLOAD_MAX_FILESIZE: 100M
     SERVER_MAX_BODY_SIZE: 100M
@@ -47,7 +47,7 @@ edge:
   environment:
     CFG_APP_DEBUG: 1
     SERVER_LOG_MINIMAL: 1
-    PHP_FPM_MEMORY_LIMIT: 256M
+    PHP_FPM_MEMORY_LIMIT: 257M
     PHP_FPM_MAX_EXECUTION_TIME: 61
     PHP_FPM_UPLOAD_MAX_FILESIZE: 100M
     SERVER_APP_NAME: docker-test