Updated nginx configuration

Author: rimi-itk

.docker/templates/default.conf.template

@@ -77,6 +77,10 @@ server {
 
         fastcgi_intercept_errors on;
         fastcgi_pass ${NGINX_FPM_SERVICE};
+
+        # @TODO Can we fall back to the default value here if NGINX_FASTCGI_READ_TIMEOUT is not defined?
+        # Cf. https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_read_timeout
+        fastcgi_read_timeout ${NGINX_FASTCGI_READ_TIMEOUT};
     }
 
     # Enforce clean URLs

docker-compose.override.yml

@@ -8,3 +8,13 @@ services:
     volumes:
       - .:/app:delegated
     working_dir: /app
+
+  phpfpm:
+    environment:
+      - PHP_MAX_EXECUTION_TIME=300
+      - PHP_MEMORY_LIMIT=512M
+
+  nginx:
+    environment:
+      # Match PHP_MAX_EXECUTION_TIME above
+      - NGINX_FASTCGI_READ_TIMEOUT=300

docker-compose.server.override.yml

@@ -0,0 +1,10 @@
+services:
+  phpfpm:
+    environment:
+      - PHP_MAX_EXECUTION_TIME=300
+      - PHP_MEMORY_LIMIT=512M
+
+  nginx:
+    environment:
+      # Match PHP_MAX_EXECUTION_TIME above
+      - NGINX_FASTCGI_READ_TIMEOUT=300