Merge branch 'nightly' into main

ibexa · Jul 31, 2024 · 6adf734 · 6adf734
2 parents 641f99c + 2be58d0
commit 6adf734
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/resources/platformsh/ibexa-commerce/5.0/.platform.app.yaml b/resources/platformsh/ibexa-commerce/5.0/.platform.app.yaml
@@ -47,7 +47,7 @@ variables:
         display_errors: Off
         display_startup_errors: Off
 
-        memory_limit: 512M
+        memory_limit: 2048M
         # The default OPcache configuration is not suited for Symfony applications
         opcache.memory_consumption: 256
         opcache.max_accelerated_files: 20000
@@ -106,7 +106,7 @@ web:
                     allow: true
 
 # The size of the persistent disk of the application (in MB).
-disk: 3072
+disk: 3572
 
 # The mounts that will be performed when the package is deployed.
 mounts:
@@ -162,28 +162,31 @@ hooks:
             echo "See: https://docs.platform.sh/guides/general/composer-auth.html#set-the-envcomposer_auth-project-variable"
         fi
 
+        composer config --global process-timeout 1200
         composer install --no-dev --prefer-dist --no-progress --no-interaction --optimize-autoloader
 
     # Deploy hook, access to services & done once (per cluster, not per node), only mounts are writable at this point
     # Note: Http traffic is paused while this is running, so for prod code this should finish as fast as possible, < 30s
     deploy: |
         set -e
 
-        if [ ! -f public/var/.platform.installed ]; then
-            # Configure ElasticSearch mappings
-            ##php bin/console ibexa:elasticsearch:put-index-template
+        # Configure ElasticSearch mappings
+        #php bin/console ibexa:elasticsearch:put-index-template
 
-            # To workaround issues with p.sh Varnish we clear container cache & temporary set Symfony Proxy
-            export SKIP_HTTPCACHE_PURGE="1"
-            rm -Rf var/cache/$APP_ENV/*
-            php bin/console cache:pool:clear cache.redis
-            sh bin/platformsh_prestart_cacheclear.sh
-            SKIP_HTTPCACHE_PURGE="1" php -d memory_limit=-1 bin/console ibexa:install
-            unset SKIP_HTTPCACHE_PURGE
-            php bin/console ibexa:graphql:generate-schema
+        # To workaround issues with p.sh Varnish we clear container cache & temporary set Symfony Proxy
+        export SKIP_HTTPCACHE_PURGE="1"
+        rm -Rf var/cache/$APP_ENV/*.*
+        php -d memory_limit=-1 bin/console doctrine:database:drop --force
+        php bin/console cache:pool:clear cache.redis
+        sh bin/platformsh_prestart_cacheclear.sh
+        SKIP_HTTPCACHE_PURGE="1" php -d memory_limit=-1 bin/console ibexa:install -vv
+        unset SKIP_HTTPCACHE_PURGE
+        php bin/console ibexa:graphql:generate-schema
 
-            touch public/var/.platform.installed
-        fi
+        for migration in nightly_migrations/* ; do
+            php bin/console ibexa:migration:import $migration
+            php bin/console ibexa:migration:migrate --file $(basename $migration)
+        done
 
         # Now that mounts are available, clear cache on mount.
         # Note: Skip on PE Cluster setup using e.g. "if [$PLATFORM_BRANCH" != 'production']; then" & get p.sh to enable this on internal per node "pre_start" hook
@@ -218,8 +221,9 @@ hooks:
 
     # Post deploy hook, like deploy but after being deployed and live, for deploy tasks we can do asynchronously
     # Tip: As this is running while web is running, and it's async, avoid doing anything like cache clearing that affects web requests here.
-    #post_deploy: |
-    #    set -e
+    post_deploy: |
+        set -e
+        php bin/console fos:httpcache:invalidate:tag ez-all
 
 # The configuration of scheduled execution.
 # see https://docs.platform.sh/configuration/app/cron.html#cron-jobs
@@ -246,6 +250,8 @@ runtime:
         - redis
         - igbinary
         - sodium
+        - blackfire
+        - newrelic
         #- apcu
         #- name: 'blackfire'
         #  configuration:

diff --git a/resources/platformsh/ibexa-commerce/5.0/.platform/services.yaml b/resources/platformsh/ibexa-commerce/5.0/.platform/services.yaml
@@ -5,7 +5,7 @@
 
 mysqldb:
     type: mariadb:10.4
-    disk: 1024
+    disk: 624
     configuration:
         schemas:
             - main
@@ -59,7 +59,7 @@ rediscache:
 
 solrsearch:
     type: solr:7.7
-    disk: 512
+    disk: 412
     configuration:
         configsets:
             mainconfig: !archive "configsets/solr6"