@scandipwa/magento-scripts 2.0.0-alpha.1 → 2.0.0-alpha.2

package/lib/config/docker.js

@@ -5,6 +5,7 @@ const { isIpAddress } = require('../util/ip');
 
 const systeminformation = require('systeminformation');
 const { deepmerge } = require('../util/deepmerge');
+const defaultEsEnv = require('./services/elasticsearch/default-es-env');
 
 /**
  *
@@ -259,10 +260,12 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ports: [`127.0.0.1:${ ports.elasticsearch }:9200`],
                 forwardedPorts: [`127.0.0.1:${ ports.elasticsearch }:9200`],
                 mounts: [`source=${ volumes.elasticsearch.name },target=/usr/share/elasticsearch/data`],
-                env: deepmerge({
+                env: deepmerge(
+                    {
                     // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
-                    'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
-                }, elasticsearch.env),
+                        'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
+                    }, elasticsearch.env || defaultEsEnv
+                ),
                 network: network.name,
                 image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
                 name: `${ prefix }_elasticsearch`

package/lib/config/services/elasticsearch/default-es-env.js

@@ -0,0 +1,6 @@
+module.exports = {
+    'bootstrap.memory_lock': true,
+    'xpack.security.enabled': false,
+    'discovery.type': 'single-node',
+    ES_JAVA_OPTS: '-Xms512m -Xmx512m'
+};

package/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js

@@ -2,6 +2,7 @@ const os = require('os');
 const { getArchSync } = require('../../../../util/arch');
 const { deepmerge } = require('../../../../util/deepmerge');
 const { repo } = require('../base-repo');
+const defaultEnv = require('../default-es-env');
 
 /**
  * @returns {import('../../../../../typings/index').ServiceWithImage}
@@ -10,12 +11,7 @@ const elasticsearch68 = ({
     image = `${ repo }:elasticsearch-6.8`
 } = {}) => ({
     image,
-    env: deepmerge({
-        'bootstrap.memory_lock': true,
-        'xpack.security.enabled': false,
-        'discovery.type': 'single-node',
-        ES_JAVA_OPTS: '-Xms512m -Xmx512m'
-    }, os.platform() === 'darwin' && getArchSync() === 'arm64' ? {
+    env: deepmerge(defaultEnv, os.platform() === 'darwin' && getArchSync() === 'arm64' ? {
         'xpack.ml.enabled': false
     } : {})
 });

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "2.0.0-alpha.1",
+    "version": "2.0.0-alpha.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "0b205dcab6056cf07988525ce053c5299af840e9"
+    "gitHead": "feac3f9df219e0a033bacf1f04afe154064bbf2f"
 }