add webp auto serving

fabriciojs · fabriciojs · commit 89c178f4c28d · 2025-10-18T14:32:16.000-03:00
diff --git a/8.1-nginx-prod/Dockerfile b/8.1-nginx-prod/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
 
diff --git a/8.1-nginx-prod/entrypoint b/8.1-nginx-prod/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}}
diff --git a/8.1-nginx-prod/wordpress-webp.conf b/8.1-nginx-prod/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.1-nginx/Dockerfile b/8.1-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
 
 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
 
diff --git a/8.1-nginx/entrypoint b/8.1-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}}
diff --git a/8.1-nginx/wordpress-webp.conf b/8.1-nginx/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.2-nginx-prod/Dockerfile b/8.2-nginx-prod/Dockerfile
@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.2 as wordpress-cli
-FROM wordpress:php8.2-fpm-alpine as wordpress
+FROM wordpress:cli-php8.2 AS wordpress-cli
+FROM wordpress:php8.2-fpm-alpine AS wordpress
 FROM kooldev/php:8.2-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
 
diff --git a/8.2-nginx-prod/entrypoint b/8.2-nginx-prod/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}}
diff --git a/8.2-nginx-prod/wordpress-webp.conf b/8.2-nginx-prod/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.2-nginx/Dockerfile b/8.2-nginx/Dockerfile
@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.2 as wordpress-cli
-FROM wordpress:php8.2-fpm-alpine as wordpress
+FROM wordpress:cli-php8.2 AS wordpress-cli
+FROM wordpress:php8.2-fpm-alpine AS wordpress
 FROM kooldev/php:8.2-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
 
diff --git a/8.2-nginx/entrypoint b/8.2-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}}
diff --git a/8.2-nginx/wordpress-webp.conf b/8.2-nginx/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.3-nginx-prod/Dockerfile b/8.3-nginx-prod/Dockerfile
@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.3 as wordpress-cli
-FROM wordpress:php8.3-fpm-alpine as wordpress
+FROM wordpress:cli-php8.3 AS wordpress-cli
+FROM wordpress:php8.3-fpm-alpine AS wordpress
 FROM kooldev/php:8.3-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
 
diff --git a/8.3-nginx-prod/entrypoint b/8.3-nginx-prod/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}}
diff --git a/8.3-nginx-prod/wordpress-webp.conf b/8.3-nginx-prod/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.3-nginx/Dockerfile b/8.3-nginx/Dockerfile
@@ -1,5 +1,5 @@
-FROM wordpress:cli-php8.3 as wordpress-cli
-FROM wordpress:php8.3-fpm-alpine as wordpress
+FROM wordpress:cli-php8.3 AS wordpress-cli
+FROM wordpress:php8.3-fpm-alpine AS wordpress
 FROM kooldev/php:8.3-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
 
diff --git a/8.3-nginx/entrypoint b/8.3-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}}
diff --git a/8.3-nginx/wordpress-webp.conf b/8.3-nginx/wordpress-webp.conf
@@ -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";
+}
diff --git a/8.4-nginx-prod/Dockerfile b/8.4-nginx-prod/Dockerfile
@@ -0,0 +1,16 @@
+FROM wordpress:cli-php8.4 AS wordpress-cli
+FROM wordpress:php8.4-fpm-alpine AS wordpress
+FROM kooldev/php:8.4-nginx-prod
+
+ENV NGINX_ROOT=/app
+
+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
+
+ENTRYPOINT [ "/kool/wordpress-entrypoint" ]
+CMD [ "supervisord", "-c", "/kool/supervisor.conf" ]
diff --git a/8.4-nginx-prod/entrypoint b/8.4-nginx-prod/entrypoint
@@ -0,0 +1,93 @@
+#!/bin/bash
+set -eo pipefail
+
+# 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}}
+
+if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
+    usermod -u $CURRENT_USER kool
+fi
+
+# user/group for Wordpress
+user=kool
+group=kool
+uid=$(id -u)
+
+if [ "$1" = 'php-fpm' ] || [ "$1" = 'supervisord' ]; then
+    # Original Wordpress Entrypoint - fresh install if none exists
+    if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
+        # if the directory exists and WordPress doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory)
+        if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then
+            chown "$user:$group" .
+        fi
+
+        echo >&2 "WordPress not found in $PWD - copying now..."
+        if [ -n "$(find -mindepth 1 -maxdepth 1 -not -name wp-content)" ]; then
+            echo >&2 "WARNING: $PWD is not empty! (copying anyhow)"
+        fi
+        sourceTarArgs=(
+            --create
+            --file -
+            --directory /kool/wordpress
+            --owner "$user" --group "$group"
+        )
+        targetTarArgs=(
+            --extract
+            --file -
+        )
+        if [ "$uid" != '0' ]; then
+            # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted"
+            targetTarArgs+=( --no-overwrite-dir )
+        fi
+        # loop over "pluggable" content in the source, and if it already exists in the destination, skip it
+        # https://github.com/docker-library/wordpress/issues/506 ("wp-content" persisted, "akismet" updated, WordPress container restarted/recreated, "akismet" downgraded)
+        for contentPath in \
+            /kool/wordpress/.htaccess \
+            /kool/wordpress/wp-content/*/*/ \
+        ; do
+            contentPath="${contentPath%/}"
+            [ -e "$contentPath" ] || continue
+            contentPath="${contentPath#/kool/wordpress/}" # "wp-content/plugins/akismet", etc.
+            if [ -e "$PWD/$contentPath" ]; then
+                echo >&2 "WARNING: '$PWD/$contentPath' exists! (not copying the WordPress version)"
+                sourceTarArgs+=( --exclude "./$contentPath" )
+            fi
+        done
+        tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
+        echo >&2 "Complete! WordPress has been successfully copied to $PWD"
+    fi
+
+    wpEnvs=( "${!WORDPRESS_@}" )
+    if [ ! -s wp-config.php ] && [ "${#wpEnvs[@]}" -gt 0 ]; then
+        for wpConfigDocker in \
+            wp-config-docker.php \
+            /kool/wordpress/wp-config-docker.php \
+        ; do
+            if [ -s "$wpConfigDocker" ]; then
+                echo >&2 "No 'wp-config.php' found in $PWD, but 'WORDPRESS_...' variables supplied; copying '$wpConfigDocker' (${wpEnvs[*]})"
+                # using "awk" to replace all instances of "put your unique phrase here" with a properly unique string (for AUTH_KEY and friends to have safe defaults if they aren't specified with environment variables)
+                awk '
+                    /put your unique phrase here/ {
+                        cmd = "head -c1m /dev/urandom | sha1sum | cut -d\\  -f1"
+                        cmd | getline str
+                        close(cmd)
+                        gsub("put your unique phrase here", str)
+                    }
+                    { print }
+                ' "$wpConfigDocker" > wp-config.php
+                if [ "$uid" = '0' ]; then
+                    # attempt to ensure that wp-config.php is owned by the run user
+                    # could be on a filesystem that doesn't allow chown (like some NFS setups)
+                    chown "$user:$group" wp-config.php || true
+                fi
+                break
+            fi
+        done
+    fi
+fi
+
+exec /kool/entrypoint "$@"
diff --git a/8.4-nginx-prod/wordpress-webp.conf b/8.4-nginx-prod/wordpress-webp.conf
diff --git a/8.4-nginx/Dockerfile b/8.4-nginx/Dockerfile
diff --git a/8.4-nginx/entrypoint b/8.4-nginx/entrypoint
diff --git a/8.4-nginx/wordpress-webp.conf b/8.4-nginx/wordpress-webp.conf
diff --git a/fwd-template.json b/fwd-template.json
diff --git a/kool.yml b/kool.yml
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
diff --git a/template/entrypoint.blade.php b/template/entrypoint.blade.php
diff --git a/template/wordpress-webp-conf.blade.php b/template/wordpress-webp-conf.blade.php
