Upgrade Magento to 2.4.0 (#425)

inviqa · Sep 28, 2020 · f3eae96 · f3eae96
1 parent 65ac35d
commit f3eae96
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 86 deletions.
diff --git a/create-test-magento.sh b/create-test-magento.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+set -x
+
+./build
+mkdir tests
+cd tests
+ws create magento2-test inviqa/magento2 --no-install
+cp -pR ../dist/harness-magento2/ magento2-test/.my127ws/
+cd magento2-test
+echo "attribute('mutagen'): no" >> workspace.override.yml
diff --git a/src/_base/docker/image/tls-offload/root/etc/nginx/conf.d/default.conf.twig b/src/_base/docker/image/tls-offload/root/etc/nginx/conf.d/default.conf.twig
@@ -34,6 +34,9 @@ server {
     proxy_set_header Host $host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $custom_scheme;
+    proxy_buffers 4 256k;
+    proxy_buffer_size 128k;
+    proxy_busy_buffers_size 256k;
     proxy_read_timeout {{ @('php.fpm.ini.max_execution_time') + 3 }}s;
     proxy_send_timeout {{ @('php.fpm.ini.max_execution_time') + 3 }}s;
     proxy_connect_timeout {{ @('php.fpm.ini.max_execution_time') + 3 }}s;

diff --git a/src/magento2/.ci/sample-dynamic/workspace.yml b/src/magento2/.ci/sample-dynamic/workspace.yml
@@ -14,6 +14,7 @@ attribute('app.services'):
   - redis
   - redis-session
   - varnish
+  - elasticsearch
 
 attribute('composer.auth.github'): = decrypt("YTozOntpOjA7czo3OiJkZWZhdWx0IjtpOjE7czoyNDoiZfbsRN210rxOzGyHhH74tuXtFxak6prxIjtpOjI7czo1Njoi7NjB2oXZJ3/wQsccea2VPeYEjU72koVub89ezkdQzAzOaaFwD2Rm1pbhWXR7aYgpUdXmNmO8g5YiO30=")
 attribute('magento.username'): = decrypt("YTozOntpOjA7czo3OiJkZWZhdWx0IjtpOjE7czoyNDoi7yUH3P6aCmMBl2qwN7PdlRI1EiWoimdCIjtpOjI7czo0ODoiRPQOwTWonSKk4MysvUFMpCh+ooh/BFclduIOquzh2lW1JWA9mAocweHxe95WExrEIjt9")

diff --git a/src/magento2/.ci/sample-static/workspace.yml b/src/magento2/.ci/sample-static/workspace.yml
@@ -12,6 +12,7 @@ attribute('app.services'):
   - redis
   - redis-session
   - varnish
+  - elasticsearch
 
 attribute('aws.bucket'): null
 attribute('app.repository'): null

diff --git a/src/magento2/application/overlay/app/etc/env.php.twig b/src/magento2/application/overlay/app/etc/env.php.twig
@@ -96,5 +96,16 @@ return [
     ],
     'install' => [
         'date' => 'Tue, 24 Jul 2018 14:00:26 +0000'
+    ],
+    'system' => [
+        'default' => [
+            'catalog' => [
+                'search' => [
+                    'engine' => 'elasticsearch7',
+                    'elasticsearch7_server_hostname' => getenv('ELASTICSEARCH_HOST')?:'elasticsearch',
+                    'elasticsearch7_server_port' => getenv('ELASTICSEARCH_PORT')?:'9200'
+                ],
+            ],
+        ],
     ]
 ];