Merge branch 'release/webserver-improvements-and-fixes' into fix/duplicate-seo-issues

Author: jaydrogers

.github/workflows/service_docker-build-and-publish.yml

@@ -67,7 +67,7 @@ jobs:
         echo "${MATRIX_JSON}" | jq '.'
   
     - name: Upload the php-versions.yml file
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: php-versions.yml
         path: ${{ inputs.php-versions-file }}
@@ -85,7 +85,7 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Download PHP Versions file
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: php-versions.yml
           path: ./artifacts
@@ -100,14 +100,14 @@ jobs:
       # Docker build & publish
       ##
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         if: ${{ inputs.push-to-registry }}
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         if: ${{ inputs.push-to-registry && inputs.authenticate_with_ghcr }}
         with:
           registry: ghcr.io

SECURITY.md

@@ -1,21 +1,29 @@
 # Security Policy
 
-## Supported Versions
-The following versions of PHP are being actively updated:
+## PHP upstream support (php.net)
 
-| PHP Version | Supported          |
-| ------- | ------------------ |
-| 8.5  | :white_check_mark: Active support |
-| 8.4  | :white_check_mark: Active support |
-| 8.3  | :warning: Security updates only |
-| 8.2  | :warning: Security updates only |
-| 8.1  | :heavy_exclamation_mark: End of life, update ASAP |
-| 8.0  | :heavy_exclamation_mark: End of life, update ASAP |
-| 7.4  | :heavy_exclamation_mark: End of life, update ASAP |
-| 7.3  | :x: Not supported |
+The table below is the **official PHP project** support phase for each branch—not a guarantee that every branch appears in our image matrix. Use it to decide when to upgrade.
 
-View the official [PHP supported versions policy](https://www.php.net/supported-versions.php) for more information.
+| Branch | Phase on php.net |
+| --- | --- |
+| 8.5 | Active support (bug + security fixes) |
+| 8.4 | Active support (bug + security fixes) |
+| 8.3 | Security fixes only |
+| 8.2 | Security fixes only |
+| 8.1 | End of life — upgrade as soon as practical |
+| 8.0 | End of life — upgrade as soon as practical |
+| 7.4 | End of life — upgrade as soon as practical |
+| ≤ 7.3 | End of life — not built in this project’s current matrix |
 
-## Reporting a Vulnerability
+**References**
 
-If you have a vulnerability to report, please follow [our responsible disclosure policy](https://www.notion.so/Responsible-Disclosure-Policy-421a6a3be1714d388ebbadba7eebbdc8).
+- [Supported Versions](https://www.php.net/supported-versions.php) — active and security support dates for current branches  
+- [End-of-life branches](https://www.php.net/eol.php) — historical EOL dates  
+
+We may still ship images for **EOL** PHP versions to help migrate legacy apps; prefer a [currently supported branch](https://www.php.net/supported-versions.php) for production.
+
+---
+
+## Reporting a vulnerability
+
+Follow [our responsible disclosure policy](https://www.notion.so/Responsible-Disclosure-Policy-421a6a3be1714d388ebbadba7eebbdc8).

docs/package.json

@@ -20,7 +20,7 @@
     "@nuxt/ui": "^4.0.1",
     "@nuxtjs/plausible": "^2.0.1",
     "@nuxtjs/sitemap": "^7.4.7",
-    "@serversideup/project-switcher-bar": "^0.0.5",
+    "@serversideup/project-switcher-bar": "^0.0.6",
     "@vueuse/core": "^14.0.0",
     "@vueuse/nuxt": "^14.0.0",
     "better-sqlite3": "^12.4.1",

docs/yarn.lock

@@ -2084,10 +2084,10 @@
   resolved "https://registry.yarnpkg.com/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz#60de891bb126abfdc5410fdc6166aca065f10a0c"
   integrity sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==
 
-"@serversideup/project-switcher-bar@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@serversideup/project-switcher-bar/-/project-switcher-bar-0.0.5.tgz#8ffe02facd4b2824afd35624e79865efd899ba99"
-  integrity sha512-ApbquhEYzXFdhmK1XkQTIvHA93iaNvhLGAwjKwzr/q3sCtsuHDlo5U8ergEkZmXH951e6jsaHFgGKp2XDQhY9A==
+"@serversideup/project-switcher-bar@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@serversideup/project-switcher-bar/-/project-switcher-bar-0.0.6.tgz#5d98bc37aff059b738e4c412f36e7ebde459394b"
+  integrity sha512-C9Z8Yrnc6phTH4uyF+21Fia3vnynZtdprBhoEijugP1TkHqKkQWoSw2z8J3SlVjKp2DP9GAP1/ou3ifNld0PHg==
 
 "@shikijs/core@3.13.0", "@shikijs/core@^3.12.2":
   version "3.13.0"

scripts/conf/php-versions-base-config.yml

@@ -95,31 +95,31 @@ operating_systems:
       - name: "Alpine 3.20"
         version: alpine3.20
         number: 3.20
-        nginx_version: 1.28.2-r1
+        nginx_version: 1.28.3-r1
       - name: "Alpine 3.21"
         version: alpine3.21
         number: 3.21
-        nginx_version: 1.28.2-r1
+        nginx_version: 1.28.3-r1
       - name: "Alpine 3.22"
         version: alpine3.22
         number: 3.22
-        nginx_version: 1.28.2-r1
+        nginx_version: 1.28.3-r1
       - name: "Alpine 3.23"
         version: alpine3.23
         number: 3.23
-        nginx_version: 1.28.2-r1
+        nginx_version: 1.28.3-r1
   - family: debian
     default: true
     versions:
       - name: "Debian Bullseye"
         version: bullseye
         number: 11
-        nginx_version: 1.28.2-1~bullseye
+        nginx_version: 1.28.3-1~bullseye
       - name: "Debian Bookworm"
         version: bookworm
         number: 12
-        nginx_version: 1.28.2-1~bookworm
+        nginx_version: 1.28.3-1~bookworm
       - name: "Debian Trixie"
         version: trixie
         number: 13
-        nginx_version: 1.28.2-1~trixie
+        nginx_version: 1.28.3-1~trixie

src/variations/frankenphp/Dockerfile

@@ -2,7 +2,7 @@
 ARG BASE_OS_VERSION='trixie'
 ARG PHP_VERSION='8.5'
 ARG BASE_IMAGE="php:${PHP_VERSION}-zts-${BASE_OS_VERSION}"
-ARG FRANKENPHP_VERSION='1.11.3'
+ARG FRANKENPHP_VERSION='1.12.2'
 ARG GOLANG_VERSION='1.26'
 
 ########################