Merge branch 'staging' into fix/lichee-url

# Conflicts:
#	.github/workflows/deploy.yml

Author: bcobzh

.github/workflows/deploy.yml

@@ -120,6 +120,7 @@ jobs:
               --set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \
               --set=pwa.image.tag=${{ inputs.docker-images-version }} \
               --set=pwa.image.pullPolicy=Always \
+              --set=postgresql.image.repository=bitnamilegacy/postgresql \
               --set=bucket.s3Upstream=storage.googleapis.com \
               --set=bucket.s3Name=api-platform-website-v3 \
               --set=service.type=NodePort \
@@ -153,6 +154,7 @@ jobs:
                 --set=php.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/php \
                 --set=php.image.tag=${{ inputs.docker-images-version }} \
                 --set=php.image.pullPolicy=Always \
+                --set=postgresql.image.repository=bitnamilegacy/postgresql \
                 --set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \
                 --set=caddy.image.tag=${{ inputs.docker-images-version }} \
                 --set=caddy.image.pullPolicy=Always \
@@ -196,4 +198,10 @@ jobs:
       - name: Check for dead links
         uses: lycheeverse/lychee-action@v2.8.0
         with:
+          # The release is served behind a self-signed cert on the cluster
+          # (*.apip.preprod-tilleuls.ovh). lychee cannot verify it and its
+          # --insecure flag is not honored, so the check can never reach the
+          # site. Keep it advisory (report, don't fail the deploy) until the
+          # cluster serves a trusted certificate, then remove `fail: false`.
+          fail: false
           args: --verbose --no-progress --accept 200,403,429 https://${{ env.URL }}

.lycheeignore

@@ -0,0 +1,12 @@
+# Customer/reference websites that reject automated requests with HTTP 403
+# (bot protection / WAF). The links are valid for real users; lychee just
+# can't reach them. Patterns are regexes matched against the full URL.
+^https?://(www\.)?decathlon\.fr
+^https?://(www\.)?vestiairecollective\.com
+^https?://(www\.)?cartier\.com
+^https?://(www\.)?volvocars\.com
+^https?://gitlab\.com/mobicoop
+
+# Reference websites that are reachable in a browser but intermittently
+# time out from CI (slow response). Not a 403, so not covered by --accept.
+^https?://(www\.)?boltcms\.io

api/.gitignore

@@ -5,6 +5,7 @@
 /.env.local.php
 /.env.*.local
 /config/secrets/prod/prod.decrypt.private.php
+/config/reference.php
 /public/bundles/
 /var/
 /vendor/

api/Dockerfile

@@ -4,7 +4,7 @@
 
 
 # Versions
-FROM php:8.2-fpm-alpine AS php_upstream
+FROM php:8.4-fpm-alpine AS php_upstream
 FROM mlocati/php-extension-installer:2 AS php_extension_installer_upstream
 FROM composer/composer:2-bin AS composer_upstream
 FROM caddy:2-alpine AS caddy_upstream

api/composer.json

@@ -2,42 +2,42 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "api-platform/core": "^3.0",
-        "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/doctrine-migrations-bundle": "^3.2",
-        "doctrine/orm": "^2.12",
-        "nelmio/cors-bundle": "^2.2",
+        "api-platform/core": "^4.3",
+        "doctrine/doctrine-bundle": "^3.2",
+        "doctrine/doctrine-migrations-bundle": "^4.0",
+        "doctrine/orm": "^3.6",
+        "nelmio/cors-bundle": "^2.6",
         "phpdocumentor/reflection-docblock": "^5.3",
-        "symfony/asset": "6.2.*",
-        "symfony/console": "6.2.*",
-        "symfony/dotenv": "6.2.*",
-        "symfony/expression-language": "6.2.*",
+        "symfony/asset": "8.1.*",
+        "symfony/console": "8.1.*",
+        "symfony/dotenv": "8.1.*",
+        "symfony/expression-language": "8.1.*",
         "symfony/flex": "^2.2",
-        "symfony/framework-bundle": "6.2.*",
-        "symfony/mercure-bundle": "^0.3.5",
-        "symfony/monolog-bundle": "^3.8",
-        "symfony/property-access": "6.2.*",
-        "symfony/property-info": "6.2.*",
-        "symfony/runtime": "6.2.*",
-        "symfony/security-bundle": "6.2.*",
-        "symfony/serializer": "6.2.*",
-        "symfony/twig-bundle": "6.2.*",
-        "symfony/validator": "6.2.*",
-        "symfony/yaml": "6.2.*"
+        "symfony/framework-bundle": "8.1.*",
+        "symfony/mercure-bundle": "^0.4",
+        "symfony/monolog-bundle": "^4.0",
+        "symfony/property-access": "8.1.*",
+        "symfony/property-info": "8.1.*",
+        "symfony/runtime": "8.1.*",
+        "symfony/security-bundle": "8.1.*",
+        "symfony/serializer": "8.1.*",
+        "symfony/twig-bundle": "8.1.*",
+        "symfony/validator": "8.1.*",
+        "symfony/yaml": "8.1.*"
     },
     "require-dev": {
         "api-platform/schema-generator": "^5.0",
-        "symfony/browser-kit": "6.2.*",
-        "symfony/css-selector": "6.2.*",
-        "symfony/debug-bundle": "6.2.*",
+        "symfony/browser-kit": "8.1.*",
+        "symfony/css-selector": "8.1.*",
+        "symfony/debug-bundle": "8.1.*",
         "symfony/maker-bundle": "^1.44",
-        "symfony/phpunit-bridge": "6.2.*",
-        "symfony/stopwatch": "6.2.*",
-        "symfony/var-dumper": "6.2.*",
-        "symfony/web-profiler-bundle": "6.2.*"
+        "symfony/phpunit-bridge": "8.1.*",
+        "symfony/stopwatch": "8.1.*",
+        "symfony/var-dumper": "8.1.*",
+        "symfony/web-profiler-bundle": "8.1.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -91,7 +91,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.2.*",
+            "require": "8.1.*",
             "docker": false
         }
     }