Merge remote-tracking branch 'upstream/master'

.platform.app.yaml

@@ -52,7 +52,7 @@ web:
             expires: 600
 
 # The size of the persistent disk of the application (in MB).
-disk: 2048
+disk: 3072
 
 # The mounts that will be performed when the package is deployed.
 mounts:

.platform/services.yaml

@@ -2,7 +2,7 @@ mysqldb:
     type: mysql:10.2
     # Version 10.1 might be a better option when running Legacy Bridge
     # For more information see https://doc.ezplatform.com/en/2.1/getting_started/requirements_and_system_configuration/#supported-setups
-    disk: 2048
+    disk: 1024
     configuration:
         schemas:
             - main
@@ -32,7 +32,7 @@ rediscache:
 # have storage space to spare for this, and don't mind a bit slower instance type of redis
 #redissession:
 #    type: redis-persistent:3.2
-#    disk: 1024
+#    disk: 512
 
 # If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml.
 # Also, you need to generate the config using:

app/config/env/platformsh.php

@@ -126,5 +126,7 @@
 
         $container->setParameter('search_engine', 'solr');
         $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr'));
+        // To set solr_core parameter we assume path is in form like: "solr/collection1"
+        $container->setParameter('solr_core', substr($endpoint['path'], 5));
     }
 }