Merge branch 'master' into 'master'

add PHP_MAX_EXECUTION_TIME option

See merge request !6

Dockerfile

@@ -17,7 +17,8 @@ ENV PHP_MEMORY_LIMIT=512M \
     PHP_VERSION=${PHP_VERSION} \
     PHP_LOG_LEVEL=notice \
     PHP_EXPOSE_INFO=Off \
-    PHP_FILE_UPLOADS=On
+    PHP_FILE_UPLOADS=On \
+    PHP_MAX_EXECUTION_TIME=30
 
 # |--------------------------------------------------------------------------
 # | install dependencies

Readme.md

@@ -13,6 +13,7 @@ This is a Alpine Linux based Docker Container, which comes with nginx and PHP pr
 |PHP_LOG_LEVEL|notice|This is the log level for the PHP FPM daemon.|
 |PHP_EXPOSE_INFO|Off|Set this to `On` if you want the `x-powered-by` header in your response.|
 |PHP_FILE_UPLOADS|On|Allow user to upload files to PHP scripts.|
+|PHP_MAX_EXECUTION_TIME|30|The maximum execution time of PHP scripts.|
 
 The Image is available in multiple PHP and alpine versions. The following tag name will be used for every image: `<branch>-<php version>-<alpine version>`. For the master branch, the branch tag is not included. At the moment the following versions are available:
 |PHP Version|Alpine Version|Tag Name|Notes

start.sh

@@ -15,6 +15,7 @@ sed -i "s|;*post_max_size =.*|post_max_size = ${PHP_MAX_POST}|i" /etc/php${PHP_V
 sed -i "s|;*cgi.fix_pathinfo=.*|cgi.fix_pathinfo= ${PHP_CGI_FIX_PATHINFO}|i" /etc/php${PHP_VERSION}/php.ini
 sed -i "s|expose_php\s*=\s*On|expose_php = ${PHP_EXPOSE_INFO}|i" /etc/php${PHP_VERSION}/php.ini
 sed -i "s|file_uploads\s*=\s*On|file_uploads = ${PHP_FILE_UPLOADS}|i" /etc/php${PHP_VERSION}/php.ini
+sed -i "s|max_execution_time\s*=.*|max_execution_time = ${PHP_MAX_EXECUTION_TIME}|i" /etc/php${PHP_VERSION}/php.ini
 
 /usr/sbin/php-fpm${PHP_VERSION}
 /usr/sbin/nginx -g "daemon off;"
\ No newline at end of file