Merge pull request #15 from kool-dev/patch-webp

Auto Serving webp if available/exists

Author: fabriciojs

.github/workflows/ci-cd.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ '8.0', '8.1', '8.2', '8.3' ]
+        version: [ '8.1', '8.2', '8.3', '8.4' ]
         type: [ '', '-prod' ]
 
     steps:
@@ -37,6 +37,7 @@ jobs:
         docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} php -v
         docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} wp --allow-root --version
         docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v
+        docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} nginx -t
         docker run kooldev/wordpress:${{ matrix.version }}-nginx${{ matrix.type }} supervisord version
 
     - name: Test docker images wordpress code

7.4-nginx/Dockerfile

@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.1 as wordpress-cli
-FROM wordpress:php8.1-fpm-alpine as wordpress
+FROM wordpress:cli-php8.1 AS wordpress-cli
+FROM wordpress:php8.1-fpm-alpine AS wordpress
 FROM kooldev/php:8.1-nginx-prod
 
 ENV NGINX_ROOT=/app
@@ -8,6 +8,7 @@ COPY --from=wordpress-cli /usr/local/bin/wp /usr/local/bin/wp
 COPY --from=wordpress --chown=kool:kool /usr/src/wordpress /kool/wordpress
 COPY --from=wordpress --chown=kool:kool /var/www/html/wp-content /app/wp-content
 COPY entrypoint /kool/wordpress-entrypoint
+COPY wordpress-webp.conf /etc/nginx/wordpress-webp.conf
 
 RUN chmod -R 777 wp-content && chmod +x /kool/wordpress-entrypoint
 

7.4-nginx/entrypoint

@@ -1,8 +1,9 @@
 #!/bin/bash
 set -eo pipefail
 
-# Nginx server config
-dockerize -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+# Add WebP support for WordPress by injecting include directive
+# Insert the include directive before the location / block
+sed -i 's/\(    location \/ {\)/    # Include WordPress WebP support\n    include \/etc\/nginx\/wordpress-webp.conf;\n\n\1/' /kool/default.tmpl
 
 # Run as current user
 CURRENT_USER=${ASUSER:-${UID:-0}}

8.0-nginx/Dockerfile

@@ -0,0 +1,17 @@
+# WordPress WebP support: automatically serve WebP images when available and supported
+location ~* ^(.+)\.(jpe?g|png)$ {
+    set $webp_suffix "";
+    
+    # Check if WebP is supported by the client
+    if ($http_accept ~* "image/webp") {
+        set $webp_suffix ".webp";
+    }
+    
+    # Try to serve the WebP version first, then fallback to original
+    try_files $uri$webp_suffix $uri /index.php?$query_string;
+    
+    # Set appropriate cache headers for images
+    expires 30d;
+    add_header Cache-Control "public, immutable";
+    add_header Vary "Accept";
+}

8.0-nginx/entrypoint

@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.1 as wordpress-cli
-FROM wordpress:php8.1-fpm-alpine as wordpress
+FROM wordpress:cli-php8.1 AS wordpress-cli
+FROM wordpress:php8.1-fpm-alpine AS wordpress
 FROM kooldev/php:8.1-nginx
 
 ENV NGINX_ROOT=/app
@@ -8,6 +8,7 @@ COPY --from=wordpress-cli /usr/local/bin/wp /usr/local/bin/wp
 COPY --from=wordpress --chown=kool:kool /usr/src/wordpress /kool/wordpress
 COPY --from=wordpress --chown=kool:kool /var/www/html/wp-content /app/wp-content
 COPY entrypoint /kool/wordpress-entrypoint
+COPY wordpress-webp.conf /etc/nginx/wordpress-webp.conf
 
 RUN chmod -R 777 wp-content && chmod +x /kool/wordpress-entrypoint
 

8.1-nginx-prod/Dockerfile

@@ -1,8 +1,9 @@
 #!/bin/bash
 set -eo pipefail
 
-# Nginx server config
-dockerize -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
+# Add WebP support for WordPress by injecting include directive
+# Insert the include directive before the location / block
+sed -i 's/\(    location \/ {\)/    # Include WordPress WebP support\n    include \/etc\/nginx\/wordpress-webp.conf;\n\n\1/' /kool/default.tmpl
 
 # Run as current user
 CURRENT_USER=${ASUSER:-${UID:-0}}