feat: unix socket, gzip, higher file uploads

Author: Justintime50

CHANGELOG.md

@@ -1,8 +1,14 @@
 # CHANGELOG
 
+## 24 (2024-11-09)
+
+- Run PHP-FPM over a Unix sockeet instead of TCP since Nginx and PHP-FPM run inside the same container
+- Enable Gzip
+- Bump file upload size from 5mb to 10mb
+
 ## 23 (2024-11-25)
 
-Fix invalid comment in `opcache.ini` file
+- Fix invalid comment in `opcache.ini` file
 
 ## 22 (2024-11-25)
 

Dockerfile

@@ -38,22 +38,14 @@ RUN apk add --no-cache --update \
     opcache \
     pdo_mysql \
     zip \
-    # Setup Nginx directories, permissions, and one-off configurations
-    && mkdir -p /var/run/nginx \
-    && chown -R www-data:www-data /var/run/nginx /var/lib/nginx /var/log/nginx \
+    # Setup directories and permissions
+    && mkdir -p /var/run/nginx /var/run/php-fpm \
+    && chown -R www-data:www-data /var/run/nginx /var/run/php-fpm /var/lib/nginx /var/log/nginx \
+    # Fix Nginx configuration
     && sed -i 's|ssl_protocols TLSv1.1|ssl_protocols|' /etc/nginx/nginx.conf \
     && sed -i 's|user nginx;|#user www-data;|' /etc/nginx/nginx.conf \
-    && sed -i 's|user =|;user =|' /usr/local/etc/php-fpm.d/www.conf \
-    && sed -i 's|group =|;group =|' /usr/local/etc/php-fpm.d/www.conf \
-    # Tune PHP-FPM for more throughput
-    && sed -i 's|pm.start_servers = 2|pm.start_servers = 4|' /usr/local/etc/php-fpm.d/www.conf \
-    && sed -i 's|pm.min_spare_servers = 1|pm.min_spare_servers = 2|' /usr/local/etc/php-fpm.d/www.conf \
-    && sed -i 's|pm.max_spare_servers = 3|pm.max_spare_servers = 8|' /usr/local/etc/php-fpm.d/www.conf \
-    && sed -i 's|pm.max_children = 5|pm.max_children = 16|' /usr/local/etc/php-fpm.d/www.conf \
-    && sed -i 's|;pm.max_requests = 500|pm.max_requests = 500|' /usr/local/etc/php-fpm.d/www.conf \
     # Enable Nginx stdout/stderr logging, disable php-fpm access logs
     && ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log \
-    && echo "access.log = /dev/null" >> /usr/local/etc/php-fpm.d/www.conf \
     # Setup msmtp log
     && touch /var/log/msmtp.log \
     && chown www-data:www-data /var/log/msmtp.log \
@@ -63,6 +55,7 @@ RUN apk add --no-cache --update \
     && rm -rf /var/cache/apk/* /tmp/*
 
 COPY /config/nginx.conf /etc/nginx/http.d/default.conf
+COPY /config/php-fpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf
 COPY /config/opcache.ini /usr/local/etc/php/conf.d/php-opocache-cfg.ini
 COPY /config/msmtp.ini /usr/local/etc/php/conf.d/php-msmtp-cfg.ini
 COPY /config/msmtprc /etc/msmtprc

config/nginx.conf

@@ -8,10 +8,18 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
     add_header X-Content-Type-Options "nosniff";
 
-    client_max_body_size 5m;
+    client_max_body_size 10m;
     client_body_buffer_size 128k;
     server_tokens off;
 
+    gzip on;
+    gzip_comp_level 6;
+    gzip_min_length 1000;
+    gzip_types text/plain text/css application/javascript application/json application/xml text/javascript;
+    gzip_proxied any;
+    gzip_buffers 16 8k;
+    gzip_disable "MSIE [1-6]\.";
+
     location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
         access_log off;
         log_not_found off;
@@ -30,7 +38,7 @@ server {
 
     location ~ \.php$ {
         try_files $uri =404;
-        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
     }

config/php-fpm.conf

@@ -0,0 +1,19 @@
+[global]
+daemonize = no
+
+[www]
+; Have Nginx and PHP-FPM connect over a socket instead of HTTP
+listen = /var/run/php-fpm/php-fpm.sock
+listen.owner = www-data
+listen.group = www-data
+listen.mode = 0660
+
+; Tune PHP-FPM for more throughput
+pm.start_servers = 4
+pm.min_spare_servers = 2
+pm.max_spare_servers = 8
+pm.max_children = 16
+pm.max_requests = 500
+
+; Don't log PHP-FPM
+access.log = /dev/null