Merge branch 'hotfix/v2.4.9'

roadiz · Jan 21, 2025 · e556302 · e556302
2 parents bc20fa7 + 3065603
commit e556302
Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to project will be documented in this file.
 
+## [2.4.9](https://github.com/roadiz/skeleton/compare/v2.4.8...v2.4.9) - 2025-01-21
+
+### Bug Fixes
+
+- Fixed solr:reindex issues on crontab by clearing cache at startup - ([1d5b368](https://github.com/roadiz/skeleton/commit/1d5b368168deec50193a2f910275aa09e192b4b0)) - Ambroise Maupate
+
 ## [2.4.8](https://github.com/roadiz/skeleton/compare/v2.4.7...v2.4.8) - 2025-01-14
 
 ### Bug Fixes

diff --git a/docker/php/docker-cron-entrypoint b/docker/php/docker-cron-entrypoint
@@ -26,6 +26,10 @@ echo "APP_DEBUG=${APP_DEBUG}";
 # To improve performance (i.e. avoid decrypting secrets at runtime),
 # you can decrypt your secrets during deployment to the "local" vault:
 /usr/bin/sudo -E -u php -- bash -c "APP_RUNTIME_ENV=prod /app/bin/console secrets:decrypt-to-local --force"
+# Must clear cache before launching cron to avoid issues with Solr reindexing
+/usr/bin/sudo -E -u php -- bash -c "APP_RUNTIME_ENV=prod /app/bin/console cache:clear -n"
+# Clear all cache pool on Symfony
+/usr/bin/sudo -E -u php -- bash -c "APP_RUNTIME_ENV=prod /app/bin/console cache:pool:clear cache.global_clearer -n"
 
 # Let cron take the wheel
 echo "Starting cron in foreground."

diff --git a/docker/php/docker-php-entrypoint b/docker/php/docker-php-entrypoint
@@ -34,7 +34,7 @@ echo "APP_DEBUG=${APP_DEBUG}";
 
 # Clear caches after migrations
 /app/bin/console cache:clear -n
-# Clear all cache pool on Symfony 5.4 https://symfony.com/doc/5.4/cache.html#clearing-the-cache
+# Clear all cache pool on Symfony
 /app/bin/console cache:pool:clear cache.global_clearer -n
 
 # first arg is `-f` or `--some-option`

diff --git a/docker/varnish/default.vcl b/docker/varnish/default.vcl
@@ -199,5 +199,13 @@ sub vcl_deliver {
     # Make sure to allow CORS on Cache-Tags header if you want to use it on Nuxt.
     unset resp.http.X-Cache-Tags;
     unset resp.http.Cache-Tags;
+
+    # We want to expose API cache-tags to the client, especially Nuxt to be able to purge frontend cache
+    # But we don't want to expose cache-tags to the client on Nuxt pages
+    #if (req.url !~ "^/api") {
+    #    # Remove cache-tags, unless you want Cloudflare or other to see them
+    #    unset resp.http.X-Cache-Tags;
+    #    unset resp.http.Cache-Tags;
+    #}
 }