@scandipwa/magento-scripts 2.4.2-alpha.2 → 2.4.2

package/lib/config/docker.js

@@ -73,11 +73,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         redis: {
             name: `${prefix}_redis-data`
         },
+        elasticsearch: {
+            name: `${prefix}_elasticsearch-data`
+        },
         opensearch: {
-            name:
-                searchengine === 'elasticsearch'
-                    ? `${prefix}_elasticsearch-data`
-                    : `${prefix}_opensearch-data`
+            name: `${prefix}_opensearch-data`
         },
         maildev: {
             name: `${prefix}_maildev-data`
@@ -115,7 +115,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             : {}
 
         /**
-         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[], serviceReadyLog?: string }>}
+         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[] }>}
          */
         const dockerConfig = {
             php: {
@@ -169,8 +169,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : '',
-                serviceReadyLog: 'ready to handle connections'
+                        : ''
             },
             phpWithXdebug: {
                 _: 'PHP with Xdebug',
@@ -229,8 +228,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : '',
-                serviceReadyLog: 'ready to handle connections'
+                        : ''
             },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
@@ -339,8 +337,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     redis.version ? `redis:${redis.version}` : redis.image
                 }`,
                 name: `${prefix}_redis`,
-                connectCommand: ['redis-cli'],
-                serviceReadyLog: 'Ready to accept connections'
+                connectCommand: ['redis-cli']
             },
             mariadb: {
                 _: 'MariaDB',
@@ -394,13 +391,15 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
                 forwardedPorts: [`127.0.0.1:${ports.elasticsearch}:9200`],
                 mountVolumes: [
-                    containerVolume({
-                        source: volumes.opensearch.name,
-                        target:
-                            searchengine === 'elasticsearch'
-                                ? '/usr/share/elasticsearch/data'
-                                : '/usr/share/opensearch/data'
-                    })
+                    searchengine === 'elasticsearch'
+                        ? containerVolume({
+                              source: volumes.elasticsearch.name,
+                              target: '/usr/share/elasticsearch/data'
+                          })
+                        : containerVolume({
+                              source: volumes.opensearch.name,
+                              target: '/usr/share/opensearch/data'
+                          })
                 ],
                 env:
                     searchengine === 'elasticsearch'
@@ -446,7 +445,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 mountVolumes: [
                     containerVolume({
                         source: volumes.maildev.name,
-                        target: '/tmp'
+                        target: '/tmp/maildev'
                     })
                 ],
                 env: {
@@ -456,7 +455,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     MAILDEV_WEB_PORT: isDockerDesktop
                         ? '1080'
                         : ports.maildevWeb,
-                    MAILDEV_MAIL_DIRECTORY: '/tmp'
+                    MAILDEV_MAIL_DIRECTORY: '/tmp/maildev'
                 },
                 name: `${prefix}_maildev`,
                 network: isDockerDesktop ? network.name : 'host',

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

@@ -3,6 +3,7 @@ module.exports = {
     mariadb103: require('./mariadb-10.3'),
     mariadb104: require('./mariadb-10.4'),
     mariadb106: require('./mariadb-10.6'),
+    mariadb1011: require('./mariadb-10.11'),
     mariadb114: require('./mariadb-11.4'),
     mariadb116: require('./mariadb-11.6')
 }

package/lib/config/services/mariadb/versions/mariadb-10.11.js

@@ -0,0 +1,11 @@
+/**
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
+ */
+const mariadb106 = () => ({
+    image: 'mariadb:10.11',
+    useOptimizerSwitch: true,
+    binFileName: 'mysql',
+    binAdminFileName: 'mysqladmin'
+})
+
+module.exports = mariadb106

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

@@ -1,9 +1,11 @@
 const mysql57 = require('./mysql-5.7')
 const mysql80 = require('./mysql-8.0')
 const mysql8028 = require('./mysql-8.0.28')
+const mysql84 = require('./mysql-8.4')
 
 module.exports = {
     mysql57,
     mysql80,
-    mysql8028
+    mysql8028,
+    mysql84
 }

package/lib/config/services/mysql/versions/mysql-8.4.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import("../../../../../typings/common").CMAConfigurationWithMySQL['configuration']['mysql']}
+ */
+const mysql84 = () => ({
+    image: 'mysql:8.4'
+})
+
+module.exports = mysql84

package/lib/config/services/varnish/index.js

@@ -6,5 +6,6 @@ module.exports = {
     varnish73: require('./varnish-7-3'),
     varnish74: require('./varnish-7-4'),
     varnish75: require('./varnish-7-5'),
-    varnish76: require('./varnish-7-6')
+    varnish76: require('./varnish-7-6'),
+    varnish77: require('./varnish-7-7')
 }

package/lib/config/services/varnish/varnish-7-7.js

@@ -0,0 +1,15 @@
+const path = require('path')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
+ */
+const varnish77 = ({ templateDir }) => ({
+    enabled: false,
+    healthCheck: false,
+    image: 'varnish:7.7',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+})
+
+module.exports = varnish77

package/lib/config/versions/magento-2.4.5-p13.js

@@ -0,0 +1,40 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p13',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.6-p11.js

@@ -0,0 +1,40 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p11',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.7-p6.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php82 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-p6',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.8-p1.js

@@ -0,0 +1,43 @@
+const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.8-p1',
+    isDefault: true,
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql80(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.8.js

@@ -21,7 +21,6 @@ const { opensearch219 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.8',
-    isDefault: true,
     configuration: {
         php: php83({
             templateDir,

package/lib/config/versions/magento-2.4.9-alpha1.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql84 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.9-alpha1',
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql84(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch87(),
+        composer: composer28(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/tasks/docker/containers/tasks.js

@@ -5,7 +5,6 @@ const KnownError = require('../../../errors/known-error')
 const containerApi = require('./container-api')
 const { imageApi } = require('../image')
 const { execAsyncSpawn } = require('../../../util/exec-async-command')
-const waitForLogs = require('../../../util/wait-for-logs')
 
 /**
  * @param {string[]} containers
@@ -155,9 +154,7 @@ const startContainers = () => ({
             all: true
         })
 
-        const containers = docker.getContainers(ports)
-
-        const missingContainers = Object.entries(containers)
+        const missingContainers = Object.entries(docker.getContainers(ports))
             .filter(
                 ([nameWithoutPrefix, { name }]) =>
                     !containerList.some((c) => c.Names === name)
@@ -192,9 +189,7 @@ const startContainers = () => ({
                         const startedContainers = []
                         subTask.title = `Container ${
                             container._
-                        } is waiting for ${dependsOn
-                            .map((a) => containers[a]._)
-                            .join(', ')} to start...`
+                        } is waiting for ${dependsOn.join(', ')} to start...`
                         await Promise.all(
                             dependsOn.map(
                                 async (name) =>
@@ -222,7 +217,6 @@ const startContainers = () => ({
                                                                 d
                                                             )
                                                     )
-                                                    .map((d) => containers[d]._)
                                                     .join(', ')} to start...`
                                                 clearTimeout(timeout)
                                                 resolve()
@@ -237,13 +231,6 @@ const startContainers = () => ({
 
                     await containerApi.run(container)
 
-                    if (container.serviceReadyLog) {
-                        await waitForLogs({
-                            containerName: container.name,
-                            matchText: container.serviceReadyLog
-                        })
-                    }
-
                     containerStatuses[
                         container.nameWithoutPrefix
                     ].started = true
@@ -253,7 +240,7 @@ const startContainers = () => ({
                         cb()
                     })
 
-                    subTask.title = `${container._} container started`
+                    subTask.output = `${container._} container started`
                 }
             })),
             {

package/lib/tasks/docker/convert-mysql-to-mariadb.js

@@ -24,7 +24,7 @@ const { createCacheFolder } = require('../cache')
 const { getSystemConfigTask } = require('../../config/system-config')
 const sleep = require('../../util/sleep')
 const { setProjectConfigTask } = require('../project-config')
-const checkSearchEngineVersion = require('../requirements/searchengine-version')
+const checkElasticSearchVersion = require('../requirements/elasticsearch-version')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -235,13 +235,23 @@ Please wait, this will take some time and do not restart the MySQL container unt
                     dockerNetwork.tasks.createNetwork(),
                     createVolumes(),
                     buildProjectImage(),
-                    checkPHPVersion(),
+                    {
+                        task: (ctx, subTask) =>
+                            subTask.newListr(
+                                [
+                                    checkPHPVersion(),
+                                    checkElasticSearchVersion()
+                                ],
+                                {
+                                    concurrent: true
+                                }
+                            )
+                    },
                     getComposerVersionTask(),
                     prepareFileSystem(),
                     installMagentoProject(),
                     enableMagentoComposerPlugins(),
                     startServices(),
-                    checkSearchEngineVersion(),
                     connectToDatabase(),
                     importDumpToDatabase(),
                     {

package/lib/tasks/docker/project-image-builder.js

@@ -316,11 +316,9 @@ const buildProjectImage = () => ({
 ${dockerFileInstructions}
 EOF`,
                             {
-                                callback: !ctx.verbose
-                                    ? undefined
-                                    : (t) => {
-                                          task.output = t
-                                      }
+                                callback: (r) => {
+                                    task.output = r
+                                }
                             }
                         )
                     } catch (e) {
@@ -346,11 +344,9 @@ EOF`,
 ${debugImageInstructions}
 EOF`,
                             {
-                                callback: !ctx.verbose
-                                    ? undefined
-                                    : (t) => {
-                                          task.output = t
-                                      }
+                                callback: (r) => {
+                                    task.output = r
+                                }
                             }
                         )
                     } catch (e) {

package/lib/tasks/file-system/create-nginx-config.js

@@ -28,16 +28,13 @@ const createNginxConfig = () => ({
         }
 
         if (isDockerDesktop) {
-            // const containers = docker.getContainers(ports)
+            const containers = docker.getContainers(ports)
 
-            // networkSettings.phpNetwork = containers.php.name
-            // networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
+            networkSettings.phpNetwork = containers.php.name
+            networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
 
-            networkSettings.phpNetwork = 'host.docker.internal'
-            networkSettings.phpWithXdebugNetwork = 'host.docker.internal'
-
-            // networkSettings.fpmPort = 9000
-            // networkSettings.fpmXdebugPort = 9000
+            networkSettings.fpmPort = 9000
+            networkSettings.fpmXdebugPort = 9000
 
             networkSettings.hostPort = 80
         }

package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js

@@ -0,0 +1,42 @@
+const envPhpToJson = require('../../../util/env-php-json')
+const magentoTask = require('../../../util/magento-task')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const disableFullPageCache = () => ({
+    title: 'Adjusting full_page cache setting',
+    task: async (ctx, task) => {
+        const envData = await envPhpToJson(ctx)
+        if (
+            envData &&
+            envData.cache_types &&
+            typeof envData.cache_types.full_page === 'number'
+        ) {
+            if (
+                envData.cache_types.full_page !== 0 &&
+                !ctx.config.overridenConfiguration.configuration.varnish.enabled
+            ) {
+                task.title = 'Disabling full_page cache in Magento'
+                return task.newListr(magentoTask('cache:disable full_page'))
+            }
+
+            if (
+                ctx.config.overridenConfiguration.configuration.varnish
+                    .enabled &&
+                envData.cache_types.full_page !== 1
+            ) {
+                task.title =
+                    'Enabling full_page cache in Magento (Varnish is enabled)'
+                return task.newListr(magentoTask('cache:enable full_page'))
+            }
+        } else {
+            task.skip('full_page cache type is not set in env.php')
+            return
+        }
+
+        task.skip()
+    }
+})
+
+module.exports = disableFullPageCache

package/lib/tasks/magento/setup-magento/configure-searchengine.js

@@ -167,8 +167,6 @@ const configureElasticSearchInDatabase = () => ({
                 }
             }
         )
-
-        task.title = `Using Elasticsearch ${ctx.elasticSearchVersion}`
     }
 })
 
@@ -358,8 +356,6 @@ const configureOpenSearchInDatabase = () => ({
                 }
             }
         )
-
-        task.title = `Using OpenSearch ${ctx.openSearchVersion}`
     }
 })
 

package/lib/tasks/magento/setup-magento/index.js

@@ -1,14 +1,16 @@
 const flushRedisConfig = require('./flush-redis-config')
+const waitingForRedis = require('./waiting-for-redis')
 const migrateDatabase = require('./migrate-database')
 const createAdmin = require('./create-admin')
 const setDeploymentMode = require('./set-deployment-mode')
 const setBaseUrl = require('./set-base-url')
 const disableMaintenanceMode = require('./disable-maintenance-mode')
+const disable2fa = require('./disable-2fa')
 const setUrlRewrite = require('./set-url-rewrite')
 const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime')
 const magentoTask = require('../../../util/magento-task')
 const urnHighlighter = require('./urn-highlighter')
-const enableFullPageCacheWithVarnish = require('./enable-full-page-cache-with-varnish')
+const adjustFullPageCache = require('./adjust-full-page-cache')
 const updateEnvPHP = require('../../php/update-env-php')
 const setMailConfig = require('./set-mail-config')
 const { setupMagentoFilePermissions } = require('./setup-file-permissions')
@@ -25,12 +27,14 @@ const setupMagento = (options = {}) => ({
         if (options.onlyInstallMagento) {
             return task.newListr([
                 flushRedisConfig(),
+                waitingForRedis(),
                 migrateDatabase({ onlyInstallMagento: true })
             ])
         }
 
         return task.newListr(
             [
+                waitingForRedis(),
                 setupMagentoFilePermissions(),
                 updateEnvPHP(),
                 migrateDatabase(),
@@ -56,8 +60,9 @@ const setupMagento = (options = {}) => ({
                 createAdmin(),
                 setDeploymentMode(),
                 disableMaintenanceMode(),
+                disable2fa(),
                 urnHighlighter(),
-                enableFullPageCacheWithVarnish(),
+                adjustFullPageCache(),
                 magentoTask('cache:flush')
             ],
             {

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -9,7 +9,6 @@ const varnishConfigSetup = require('./varnish-config')
 const pathExists = require('../../../util/path-exists')
 const updateEnvPHP = require('../../php/update-env-php')
 const UnknownError = require('../../../errors/unknown-error')
-const checkSearchEngineVersion = require('../../requirements/searchengine-version')
 
 /**
  * @param {Object} [options]
@@ -20,7 +19,6 @@ const migrateDatabase = (options = {}) => ({
     title: 'Migrating database',
     task: async (ctx, task) => {
         const { databaseConnection } = ctx
-        const { varnish } = ctx.config.overridenConfiguration.configuration
 
         const [[{ tableCount }]] = await databaseConnection.query(`
             SELECT count(*) AS tableCount
@@ -46,17 +44,12 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr(
                 [
-                    checkSearchEngineVersion(),
                     installMagento({ isDbEmpty: true }),
                     updateEnvPHP(),
                     varnishConfigSetup(),
                     configureSearchEngine(),
                     upgradeMagento(),
-                    magentoTask(
-                        `cache:disable block_html layout${
-                            !varnish.enabled ? ' full_page' : ''
-                        }`
-                    )
+                    magentoTask('cache:enable')
                 ],
                 {
                     concurrent: false,
@@ -82,11 +75,7 @@ const migrateDatabase = (options = {}) => ({
                 ctx.isSetupUpgradeNeeded = false
                 // no setup is needed, but still to be sure configure ES
                 return task.newListr(
-                    [
-                        checkSearchEngineVersion(),
-                        varnishConfigSetup(),
-                        configureSearchEngine()
-                    ],
+                    [varnishConfigSetup(), configureSearchEngine()],
                     {
                         concurrent: false,
                         exitOnError: true,
@@ -101,7 +90,6 @@ const migrateDatabase = (options = {}) => ({
                 if (options.onlyInstallMagento) {
                     ctx.isSetupUpgradeNeeded = false
                     return task.newListr([
-                        checkSearchEngineVersion(),
                         installMagentoProject(),
                         installMagento()
                     ])
@@ -109,18 +97,13 @@ const migrateDatabase = (options = {}) => ({
 
                 return task.newListr(
                     [
-                        checkSearchEngineVersion(),
                         installMagentoProject(),
                         installMagento(),
                         updateEnvPHP(),
                         varnishConfigSetup(),
                         configureSearchEngine(),
                         upgradeMagento(),
-                        magentoTask(
-                            `cache:disable block_html layout${
-                                !varnish.enabled ? ' full_page' : ''
-                            }`
-                        )
+                        magentoTask('cache:enable')
                     ],
                     {
                         concurrent: false,
@@ -135,7 +118,6 @@ const migrateDatabase = (options = {}) => ({
             case 2: {
                 return task.newListr(
                     [
-                        checkSearchEngineVersion(),
                         varnishConfigSetup(),
                         configureSearchEngine(),
                         upgradeMagento()

package/lib/tasks/requirements/elasticsearch-version.js

@@ -0,0 +1,87 @@
+const { getPort } = require('../../config/port-config')
+const KnownError = require('../../errors/known-error')
+const UnknownError = require('../../errors/unknown-error')
+const { containerApi } = require('../docker/containers')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const checkElasticSearchVersion = () => ({
+    title: 'Checking container ElasticSearch version',
+    task: async (ctx, task) => {
+        const { elasticsearch } =
+            ctx.config.overridenConfiguration.configuration
+        const { ports } = ctx
+
+        const { elasticsearch: elasticSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
+        let elasticSearchVersionResponse
+
+        const elasticSearchContainerRunning = await containerApi.ls({
+            filter: `name=${elasticSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            elasticSearchContainerRunning.length !== 0 &&
+            elasticSearchContainerRunning[0].State === 'running'
+        ) {
+            elasticSearchVersionResponse = await containerApi.exec({
+                command: 'elasticsearch --version',
+                container: elasticSearchContainer.name
+            })
+        } else {
+            try {
+                const availableElasticSearchPort = await getPort(
+                    ports.elasticsearch
+                )
+                elasticSearchVersionResponse = await containerApi.run({
+                    ...elasticsearch,
+                    command: 'elasticsearch --version',
+                    detach: false,
+                    rm: true,
+                    ports: [`127.0.0.1:${availableElasticSearchPort}:9200`],
+                    memory: '2gb'
+                })
+            } catch (e) {
+                elasticSearchVersionResponse = e.message
+            }
+        }
+
+        if (
+            ctx.cgroupVersion === 'v2' &&
+            elasticSearchVersionResponse.includes(
+                'Cannot invoke "jdk.internal.platform.CgroupInfo.getMountPoint()" because "anyController" is null'
+            )
+        ) {
+            throw new KnownError(`ElasticSearch failed to start up due to a JVM bug with CGroup version 2.
+Similar issue on StackOverflow: https://stackoverflow.com/q/71532170.
+
+Right now is check if OpenSearch works with your version of Magento.
+Follow the documentation: https://docs.create-magento-app.com/getting-started/config-file#searchengine-opensearch-elasticsearch
+
+If it will not help, try updating ElasticSearch image version: https://docs.create-magento-app.com/getting-started/config-file#elasticsearch
+`)
+        }
+
+        const elasticSearchVersionResponseResult =
+            elasticSearchVersionResponse.match(/Version:\s(\d+\.\d+\.\d+)/i)
+
+        if (
+            elasticSearchVersionResponseResult &&
+            elasticSearchVersionResponseResult.length > 0
+        ) {
+            const elasticSearchVersion = elasticSearchVersionResponseResult[1]
+
+            ctx.elasticSearchVersion = elasticSearchVersion
+            task.title = `Using ElasticSearch version ${elasticSearchVersion} in container`
+        } else {
+            throw new UnknownError(
+                `Cannot retrieve ElasticSearch Version!\n\n${elasticSearchVersionResponse}`
+            )
+        }
+    }
+})
+
+module.exports = checkElasticSearchVersion

package/lib/tasks/requirements/opensearch-version.js

@@ -0,0 +1,71 @@
+const { getPort } = require('../../config/port-config')
+const UnknownError = require('../../errors/unknown-error')
+const { containerApi } = require('../docker/containers')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const checkOpenSearchVersion = () => ({
+    title: 'Checking container OpenSearch version',
+    task: async (ctx, task) => {
+        const { opensearch } = ctx.config.overridenConfiguration.configuration
+        const { ports } = ctx
+
+        const { elasticsearch: openSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
+        let openSearchVersionResponse
+
+        const openSearchContainerRunning = await containerApi.ls({
+            filter: `name=${openSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            openSearchContainerRunning.length !== 0 &&
+            openSearchContainerRunning[0].State === 'running'
+        ) {
+            openSearchVersionResponse = await containerApi.exec({
+                command: 'opensearch --version',
+                container: openSearchContainer.name
+            })
+        } else {
+            try {
+                const availableOpenSearchPort = await getPort(
+                    ports.elasticsearch
+                )
+                openSearchVersionResponse = await containerApi.run({
+                    ...opensearch,
+                    command: 'opensearch --version',
+                    detach: false,
+                    rm: true,
+                    ports: [`127.0.0.1:${availableOpenSearchPort}:9200`],
+                    memory: '2gb'
+                })
+            } catch (e) {
+                openSearchVersionResponse = e.message
+            }
+        }
+
+        const openSearchVersionResponseResult = openSearchVersionResponse.match(
+            /Version:\s(\d+\.\d+\.\d+)/i
+        )
+
+        if (
+            openSearchVersionResponseResult &&
+            openSearchVersionResponseResult.length > 0
+        ) {
+            const openSearchVersion = openSearchVersionResponseResult[1]
+
+            ctx.openSearchVersion = openSearchVersion
+            task.title = `Using OpenSearch version ${openSearchVersion} in container`
+        } else {
+            throw new UnknownError(
+                `Cannot retrieve OpenSearch Version!\n\n${openSearchVersionResponse}`
+            )
+        }
+    },
+    exitOnError: false
+})
+
+module.exports = checkOpenSearchVersion

package/lib/tasks/requirements/searchengine-version.js

@@ -1,70 +1,18 @@
-const { request } = require('smol-request')
-const UnknownError = require('../../errors/unknown-error')
-const waitForLogs = require('../../util/wait-for-logs')
+const checkElasticSearchVersion = require('./elasticsearch-version')
+const checkOpenSearchVersion = require('./opensearch-version')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const checkSearchEngineVersion = () => ({
     task: async (ctx, task) => {
-        const {
-            ports,
-            config: {
-                overridenConfiguration: {
-                    configuration: { searchengine }
-                }
-            }
-        } = ctx
-
-        const { elasticsearch } = ctx.config.docker.getContainers(ports)
-
-        await waitForLogs({
-            containerName: elasticsearch.name,
-            matchText:
-                searchengine === 'elasticsearch' ? '"started"' : '] started'
-        })
-
-        try {
-            const response = await request(
-                `http://localhost:${ports.elasticsearch}/`,
-                {
-                    method: 'GET',
-                    responseType: 'json'
-                }
-            )
-
-            if (response.status !== 200) {
-                if (
-                    ctx.config.overridenConfiguration.configuration
-                        .searchengine === 'opensearch'
-                ) {
-                    throw new UnknownError(
-                        `OpenSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
-                    )
-                } else {
-                    throw new UnknownError(
-                        `ElasticSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
-                    )
-                }
-            }
-
-            const searchEngineVersion = response.data.version.number
-            if (searchengine === 'elasticsearch') {
-                ctx.elasticSearchVersion = searchEngineVersion
-            } else {
-                ctx.openSearchVersion = searchEngineVersion
-            }
-        } catch (e) {
-            if (searchengine === 'opensearch') {
-                throw new UnknownError(
-                    `Cannot connect to OpenSearch container!\n\n${e.message}`
-                )
-            } else {
-                throw new UnknownError(
-                    `Cannot connect to ElasticSearch container!\n\n${e.message}`
-                )
-            }
+        const { searchengine = 'elasticsearch' } =
+            ctx.config.overridenConfiguration.configuration
+        if (searchengine === 'opensearch') {
+            return task.newListr(checkOpenSearchVersion())
         }
+
+        return task.newListr(checkElasticSearchVersion())
     }
 })
 

package/lib/tasks/start.js

@@ -38,6 +38,7 @@ const { setProjectConfigTask } = require('./project-config')
 const {
     convertComposerHomeToComposerCacheVolume
 } = require('./docker/convert-composer-home-to-composer-cache-volume')
+const checkSearchEngineVersion = require('./requirements/searchengine-version')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -128,7 +129,15 @@ const configureProject = () => ({
                         { concurrent: true }
                     )
             },
-            checkPHPVersion(),
+            {
+                task: (ctx, subTask) =>
+                    subTask.newListr(
+                        [checkPHPVersion(), checkSearchEngineVersion()],
+                        {
+                            concurrent: true
+                        }
+                    )
+            },
             buildProjectImage(),
             getComposerVersionTask(),
             prepareFileSystem(),

package/lib/tasks/theme/link-theme.js

@@ -1,6 +1,6 @@
 const symlinkTheme = require('./symlink-theme')
 const installTheme = require('./install-theme')
-const enableFullPageCacheWithVarnish = require('../magento/setup-magento/enable-full-page-cache-with-varnish')
+const adjustFullPageCache = require('../magento/setup-magento/adjust-full-page-cache')
 const disablePageBuilder = require('../magento/setup-magento/disable-page-builder')
 const buildTheme = require('./build-theme')
 const upgradeMagento = require('../magento/setup-magento/upgrade-magento')
@@ -55,7 +55,7 @@ const linkTheme = () => ({
             installTheme(theme),
             updateEnvPHP(),
             upgradeMagento(),
-            enableFullPageCacheWithVarnish(),
+            adjustFullPageCache(),
             ...(isPageBuilderInstalled && Number(isPagebuilderEnabled)
                 ? [disablePageBuilder()]
                 : []),

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.4.2-alpha.2",
+    "version": "2.4.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "3b0fbecf1e4a2ac197e21a53b5433cafeb81eaae"
+    "gitHead": "fc6fc272e01ce2442814452a14e0d2c6fe28a9f7"
 }

package/typings/context.d.ts

@@ -118,7 +118,6 @@ export interface ListrContext {
                     command: string
                     connectCommand: string[]
                     dependsOn?: string[]
-                    serviceReadyLog?: string
                 }
             >
         }
@@ -155,5 +154,4 @@ export interface ListrContext {
     dockerServerData?: DockerVersionResult['Server']
     dockerClientData?: DockerVersionResult['Client']
     dockerVersion?: DockerVersionResult['Server']['Version']
-    dockerMemoryLimit: number
 }

package/lib/tasks/magento/setup-magento/enable-full-page-cache-with-varnish.js

@@ -1,30 +0,0 @@
-const envPhpToJson = require('../../../util/env-php-json')
-const magentoTask = require('../../../util/magento-task')
-
-/**
- * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
- */
-const enableFullPageCacheWithVarnish = () => ({
-    skip: (ctx) => {
-        const { varnish } = ctx.config.overridenConfiguration.configuration
-
-        return !varnish.enabled
-    },
-    task: async (ctx, task) => {
-        const envData = await envPhpToJson(ctx)
-        if (
-            envData &&
-            envData.cache_types &&
-            typeof envData.cache_types.full_page === 'number' &&
-            envData.cache_types.full_page !== 1
-        ) {
-            task.title =
-                'Enabling full_page cache in Magento (Varnish is enabled)'
-            return task.newListr(magentoTask('cache:enable full_page'))
-        }
-
-        task.skip()
-    }
-})
-
-module.exports = enableFullPageCacheWithVarnish