use elasticsearch 6.8 cma image for magento 2.3.0-2.3.4

scandipwa · Jul 29, 2022 · 62e9ad4 · 62e9ad4
1 parent 9905605
commit 62e9ad4
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 31 deletions.
diff --git a/build-packages/magento-scripts/lib/config/docker.js b/build-packages/magento-scripts/lib/config/docker.js
@@ -271,7 +271,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
                 },
                 network: network.name,
-                image: `elasticsearch:${ elasticsearch.version }`,
+                image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
                 name: `${ prefix }_elasticsearch`
             }
         };

diff --git a/build-packages/magento-scripts/lib/config/services/elasticsearch/base-repo.js b/build-packages/magento-scripts/lib/config/services/elasticsearch/base-repo.js
@@ -0,0 +1,3 @@
+module.exports = {
+    repo: 'ghcr.io/scandipwa/create-magento-app'
+};
diff --git a/...-packages/magento-scripts/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js b/...-packages/magento-scripts/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js
@@ -0,0 +1,12 @@
+const { repo } = require('../base-repo');
+
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const elasticsearch68 = ({
+    image = `${ repo }:elasticsearch-6.8`
+} = {}) => ({
+    image
+});
+
+module.exports = elasticsearch68;
diff --git a/build-packages/magento-scripts/lib/config/services/elasticsearch/versions/index.js b/build-packages/magento-scripts/lib/config/services/elasticsearch/versions/index.js
@@ -0,0 +1,5 @@
+const elasticsearch68 = require('./elasticsearch-6.8');
+
+module.exports = {
+    elasticsearch68
+};
diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.0.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.0.js
@@ -3,6 +3,7 @@ const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php72 } = require('../php/versions');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '5.6.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.1.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.1.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.2-p1.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.2-p1.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.2-p2.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.2-p2.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.2.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.2.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.3-p1.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.3-p1.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.3.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.3.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.4-p1.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.4-p1.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.4-p2.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.4-p2.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

diff --git a/build-packages/magento-scripts/lib/config/versions/magento-2.3.4.js b/build-packages/magento-scripts/lib/config/versions/magento-2.3.4.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
@@ -27,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },