@scandipwa/magento-scripts 2.0.0-alpha.0 → 2.0.0-alpha.3

package/lib/commands/cli.js

@@ -61,8 +61,8 @@ module.exports = (yargs) => {
             .addEmptyLine();
 
         block
-            .addLine(`Connect to MySQL server: ${logger.style.command('mysql')}`)
-            .addLine(`Connect to MySQL server as root: ${logger.style.command('mysqlroot')}`)
+            .addLine(`Connect to MariaDB server: ${logger.style.command('mariadb')}`)
+            .addLine(`Connect to MariaDB server as root: ${logger.style.command('mariadbroot')}`)
             .addEmptyLine();
 
         block.log();

package/lib/commands/execute.js

@@ -18,7 +18,7 @@ module.exports = (yargs) => {
             yargs.usage(`Usage: npm run exec <container name> [commands...]
 
 Available containers:
-- mysql
+- mariadb
 - nginx
 - redis
 - elasticsearch

package/lib/commands/import-db.js

@@ -8,7 +8,7 @@ const importDump = require('../tasks/import-dump');
 module.exports = (yargs) => {
     yargs.command(
         'import-db [importDb]',
-        'Import database dump to MySQL',
+        'Import database dump to MariaDB',
         (yargs) => {
             yargs.option('remote-db', {
                 alias: 'r',

package/lib/commands/logs.js

@@ -14,7 +14,7 @@ module.exports = (yargs) => {
 
 Available scopes:
 - magento
-- mysql
+- mariadb
 - redis
 - nginx
 - elasticsearch

package/lib/commands/start.js

@@ -69,10 +69,6 @@ module.exports = (yargs) => {
                 type: 'boolean',
                 default: false
             })
-            .option('import-db', {
-                describe: 'Import database dump to MySQL',
-                type: 'string'
-            })
             .option('edition', {
                 alias: 'e',
                 describe: 'Magento Edition to install',
@@ -169,7 +165,7 @@ module.exports = (yargs) => {
                 block.log();
 
                 logger.note(
-                    `MySQL credentials, containers status and project information available in ${logger.style.code('npm run status')} command.
+                    `MariaDB credentials, containers status and project information available in ${logger.style.code('npm run status')} command.
       To access Magento CLI, Composer and PHP for this project use ${logger.style.code('npm run cli')} command.`
                 );
                 logger.log('');

package/lib/config/docker.js

@@ -4,6 +4,8 @@ const getPhpConfig = require('./php-config');
 const { isIpAddress } = require('../util/ip');
 
 const systeminformation = require('systeminformation');
+const { deepmerge } = require('../util/deepmerge');
+const defaultEsEnv = require('./services/elasticsearch/default-es-env');
 
 /**
  *
@@ -30,21 +32,24 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         cacheDir
     } = baseConfig;
 
-    const cpuSupportedFlags = await systeminformation.cpuFlags();
+    const cpuSupportedFlags = (await systeminformation.cpuFlags()).split(' ');
 
     const network = {
         name: `${ prefix }_network`
     };
 
     const volumes = {
-        mysql: {
-            name: `${ prefix }_mysql-data`
+        mariadb: {
+            name: `${ prefix }_mariadb-data`
         },
         redis: {
             name: `${ prefix }_redis-data`
         },
         elasticsearch: {
             name: `${ prefix }_elasticsearch-data`
+        },
+        composer_home: {
+            name: 'composer_home-data'
         }
     };
 
@@ -59,7 +64,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
          */
         volumes.php = {
             name: `${ prefix }_project-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(magentoDir),
                 o: 'bind'
@@ -67,7 +72,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
         volumes.nginx = {
             name: `${ prefix }_nginx-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
@@ -75,7 +80,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
         volumes.appPub = {
             name: `${ prefix }_pub-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(magentoDir, 'pub'),
                 o: 'bind'
@@ -83,7 +88,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
         volumes.appSetup = {
             name: `${ prefix }_setup-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(magentoDir, 'setup'),
                 o: 'bind'
@@ -91,7 +96,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
         volumes.sslTerminator = {
             name: `${ prefix }_ssl-terminator-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
@@ -101,7 +106,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         if (varnish.enabled) {
             volumes.varnish = {
                 name: `${ prefix }_varnish-data`,
-                opts: {
+                opt: {
                     type: 'nfs',
                     device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
@@ -128,11 +133,13 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 network: isNotNativeLinux ? network.name : 'host',
                 mountVolumes: [
                     `${ isLinux ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
+                    `${ volumes.composer_home.name }:/composer/home`,
                     `${ php.iniPath }:/usr/local/etc/php/php.ini`,
                     `${ php.fpmConfPath }:/usr/local/etc/php-fpm.d/zz-docker.conf`
                 ],
                 env: {
-                    COMPOSER_AUTH: process.env.COMPOSER_AUTH || ''
+                    COMPOSER_AUTH: process.env.COMPOSER_AUTH || '',
+                    COMPOSER_HOME: '/composer/home'
                 },
                 restart: 'on-failure:5',
                 image: `local-cma-project:${ prefix }`,
@@ -166,7 +173,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ],
                 restart: 'on-failure:5',
                 network: isNotNativeLinux ? network.name : 'host',
-                image: `nginx:${ nginx.version }`,
+                image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_ssl-terminator`,
                 command: "nginx -g 'daemon off;'"
             },
@@ -198,7 +205,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 restart: 'on-failure:5',
                 // TODO: use connect instead
                 network: isNotNativeLinux ? network.name : 'host',
-                image: `nginx:${ nginx.version }`,
+                image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_nginx`,
                 command: "nginx -g 'daemon off;'"
             },
@@ -212,47 +219,37 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 mounts: [`source=${ volumes.redis.name },target=/data`],
                 // TODO: use connect instead
                 network: network.name,
-                image: `redis:${ redis.version }`,
-                imageDetails: {
-                    name: 'redis',
-                    tag: redis.version
-                },
+                image: `${ redis.version ? `redis:${ redis.version }` : redis.image }`,
                 name: `${ prefix }_redis`,
                 connectCommand: ['redis-cli']
             },
-            mysql: {
+            mariadb: {
                 _: 'MariaDB',
                 healthCheck: {
                     cmd: 'mysqladmin ping --silent'
                 },
-                ports: [`127.0.0.1:${ ports.mysql }:3306`],
-                forwardedPorts: [`127.0.0.1:${ ports.mysql }:3306`],
-                mounts: [`source=${ volumes.mysql.name },target=/var/lib/mysql`],
+                ports: [`127.0.0.1:${ ports.mariadb }:3306`],
+                forwardedPorts: [`127.0.0.1:${ ports.mariadb }:3306`],
+                mountVolumes: [
+                    `${ volumes.mariadb.name }:/var/lib/mysql`,
+                    `${ path.join(baseConfig.cacheDir, 'mariadb.cnf') }:/etc/mysql/my.cnf`
+                ],
                 env: {
-                    MYSQL_PORT: 3306,
-                    MYSQL_ROOT_PASSWORD: 'scandipwa',
-                    MYSQL_USER: 'magento',
-                    MYSQL_PASSWORD: 'magento',
-                    MYSQL_DATABASE: 'magento'
+                    MARIADB_PORT: 3306,
+                    MARIADB_ROOT_PASSWORD: 'scandipwa',
+                    MARIADB_USER: 'magento',
+                    MARIADB_PASSWORD: 'magento',
+                    MARIADB_DATABASE: 'magento'
                 },
-                /**
-                 * When database dump contains functions, MySQL can throw and error "access denied for those functions"
-                 * so to overcome this issue, we need to enable trust option for these functions to avoid errors during migrations.
-                 *
-                 * Documentation reference: https://dev.mysql.com/doc/refman/5.7/en/stored-programs-logging.html
-                 */
                 command: [
-                    '--log_bin_trust_function_creators=1',
-                    '--default-authentication-plugin=mysql_native_password',
-                    '--max_allowed_packet=1GB',
-                    '--bind-address=0.0.0.0'
+                    '--log_bin_trust_function_creators=1'
                 ]
                     .join(' '),
                 securityOptions: [
                     'seccomp=unconfined'
                 ],
                 network: network.name,
-                image: `mariadb:${ mariadb.version }`,
+                image: `${ mariadb.version ? `mariadb:${ mariadb.version }` : mariadb.image }`,
                 name: `${ prefix }_mariadb`
             },
             elasticsearch: {
@@ -263,16 +260,14 @@ 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: {
-                    'bootstrap.memory_lock': true,
-                    'xpack.security.enabled': false,
-                    'discovery.type': 'single-node',
-                    ES_JAVA_OPTS: '-Xms512m -Xmx512m',
+                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))
-                },
+                        'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
+                    }, elasticsearch.env || defaultEsEnv
+                ),
                 network: network.name,
-                image: `elasticsearch:${ elasticsearch.version }`,
+                image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
                 name: `${ prefix }_elasticsearch`
             }
         };
@@ -286,7 +281,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         if (!ctx.debug && varnish.enabled) {
             dockerConfig.varnish = {
                 _: 'Varnish',
-                image: `varnish:${ varnish.version }`,
+                image: `${ varnish.version ? `varnish:${ varnish.version }` : varnish.image }`,
                 name: `${ prefix }_varnish`,
                 mountVolumes: [
                     `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`

package/lib/config/index.js

@@ -19,7 +19,7 @@ const darwinMinimalVersion = '10.5';
 const getBaseConfig = (projectPath = process.cwd(), prefix = folderName) => ({
     prefix: getPrefix(prefix),
     magentoDir: projectPath,
-    containerMagentoDir: '/var/www/html',
+    containerMagentoDir: projectPath,
     templateDir: path.join(__dirname, 'templates'),
     cacheDir: path.join(projectPath, 'node_modules', '.create-magento-app-cache')
 });

package/lib/config/port-config.js

@@ -58,7 +58,7 @@ const defaultPorts = {
     varnish: 8080,
     sslTerminator: 80,
     fpm: 9000,
-    mysql: 3306,
+    mariadb: 3306,
     redis: 6379,
     elasticsearch: 9200
 };

package/lib/config/services/elasticsearch/base-repo.js

@@ -0,0 +1,3 @@
+module.exports = {
+    repo: 'ghcr.io/scandipwa/create-magento-app'
+};

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

@@ -0,0 +1,19 @@
+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}
+ */
+const elasticsearch68 = ({
+    image = `${ repo }:elasticsearch-6.8`
+} = {}) => ({
+    image,
+    env: deepmerge(defaultEnv, os.platform() === 'darwin' && getArchSync() === 'arm64' ? {
+        'xpack.ml.enabled': false
+    } : {})
+});
+
+module.exports = elasticsearch68;

package/lib/config/services/elasticsearch/versions/index.js

@@ -0,0 +1,5 @@
+const elasticsearch68 = require('./elasticsearch-6.8');
+
+module.exports = {
+    elasticsearch68
+};

package/lib/config/templates/magentorc.template

@@ -11,7 +11,7 @@ alias c="composer"
 <% if (it.varnishEnabled) { %>
 alias cvc="npm run exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"
 <% } %>
-alias mysql="npm run exec mysql 'mysql -umagento -pmagento'"
-alias mysqlroot="npm run exec mysql 'mysql -uroot -pscandipwa'"
+alias mariadb="npm run exec mariadb 'mysql -umagento -pmagento'"
+alias mariadbroot="npm run exec mariadb 'mysql -uroot -pscandipwa'"
 
 export BASH_SILENCE_DEPRECATION_WARNING=1

package/lib/config/templates/mariadb.template.cnf

@@ -0,0 +1,191 @@
+# MariaDB database server configuration file.
+#
+# You can copy this file to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port            = 3306
+socket          = /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket          = /var/run/mysqld/mysqld.sock
+nice            = 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+#user           = mysql
+pid-file        = /var/run/mysqld/mysqld.pid
+socket          = /var/run/mysqld/mysqld.sock
+port            = 3306
+basedir         = /usr
+datadir         = /var/lib/mysql
+tmpdir          = /tmp
+lc_messages_dir = /usr/share/mysql
+lc_messages     = en_US
+skip-external-locking
+#q
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+# bind-address           = 0.0.0.0
+#
+# * Fine Tuning
+#
+max_connections         = 100
+connect_timeout         = 200
+wait_timeout            = 28800
+max_allowed_packet      = 1GB
+thread_cache_size       = 128
+sort_buffer_size        = 4M
+bulk_insert_buffer_size = 16M
+tmp_table_size          = 32M
+max_heap_table_size     = 32M
+#
+# * MyISAM
+#
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched. On error, make copy and try a repair.
+myisam_recover_options = BACKUP
+key_buffer_size         = 128M
+#open-files-limit       = 2000
+table_open_cache        = 400
+myisam_sort_buffer_size = 512M
+concurrent_insert       = 2
+read_buffer_size        = 2M
+read_rnd_buffer_size    = 1M
+#
+# * Query Cache Configuration
+#
+# Cache only tiny result sets, so we can fit more in the query cache.
+query_cache_limit               = 128K
+query_cache_size                = 64M
+# for more write intensive setups, set to DEMAND or OFF
+#query_cache_type               = DEMAND
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# we do want to know about network errors and such
+#log_warnings           = 2
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log[={0|1}]
+slow_query_log_file     = /var/log/mysql/mariadb-slow.log
+long_query_time = 10
+#log_slow_rate_limit    = 1000
+#log_slow_verbosity     = query_plan
+
+#log-queries-not-using-indexes
+#log_slow_admin_statements
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id              = 1
+#report_host            = master1
+#auto_increment_increment = 2
+#auto_increment_offset  = 1
+#log_bin                        = /var/log/mysql/mariadb-bin
+#log_bin_index          = /var/log/mysql/mariadb-bin.index
+# not fab for performance, but safer
+#sync_binlog            = 1
+expire_logs_days        = 10
+max_binlog_size         = 100M
+# slaves
+#relay_log              = /var/log/mysql/relay-bin
+#relay_log_index        = /var/log/mysql/relay-bin.index
+#relay_log_info_file    = /var/log/mysql/relay-bin.info
+#log_slave_updates
+#read_only
+#
+# If applications support it, this stricter sql_mode prevents some
+# mistakes like inserting invalid dates etc.
+#sql_mode               = NO_ENGINE_SUBSTITUTION,TRADITIONAL
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+default_storage_engine  = InnoDB
+innodb_buffer_pool_size = 256M
+innodb_log_buffer_size  = 8M
+innodb_file_per_table   = 1
+innodb_open_files       = 400
+innodb_io_capacity      = 400
+innodb_flush_method     = O_DIRECT
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_on=ON
+#wsrep_provider=
+#wsrep_cluster_address=
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#
+# Allow server to accept connections on all interfaces.
+#
+#bind-address=0.0.0.0
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet      = 16M
+
+[mysql]
+#no-auto-rehash # faster start of mysql but no tab completion
+
+[isamchk]
+key_buffer              = 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+[mariadb]
+skip-host-cache
+skip-name-resolve
+
+!includedir /etc/mysql/conf.d/

package/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'
         },

package/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'
         },

package/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'
         },

package/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'
         },

package/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'
         },

package/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'
         },

package/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'
         },