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

package/lib/commands/execute.js

@@ -11,12 +11,15 @@ module.exports = (yargs) => {
             yargs.usage(`Usage: npm run exec <container name> [command...]
 
 Available containers:
-- mariadb
+- php
+- phpWithXdebug
+- sslTerminator
 - nginx
 - redis
+- mariadb
 - elasticsearch
-- varnish (if enabled)
-- sslTerminator`)
+- maildev
+- varnish (if enabled)`)
         },
         async () => {
             const [containerName, ...commands] = process.argv.slice(3)

package/lib/commands/logs.js

@@ -20,12 +20,15 @@ module.exports = (yargs) => {
 
 Available scopes:
 - magento
-- mariadb
-- redis
+- php
+- phpWithXdebug
+- sslTerminator
 - nginx
+- redis
+- mariadb
 - elasticsearch
+- maildev
 - varnish (if enabled)
-- sslTerminator
 
 And you can use name matching:
 npm run logs ma (will match magento)

package/lib/config/docker.js

@@ -137,13 +137,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({
                         source: volumes.composer_cache.name,
-                        target: '/composer/home/cache',
-                        rw: true
+                        target: '/composer/home/cache'
                     }),
                     containerVolume({
                         source: php.iniPath,
@@ -191,13 +189,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({
                         source: volumes.composer_cache.name,
-                        target: '/composer/home/cache',
-                        rw: true
+                        target: '/composer/home/cache'
                     }),
                     containerVolume({
                         source: php.iniPath,
@@ -303,7 +299,6 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({

package/lib/config/services/composer/versions/composer-2.8.js

@@ -2,7 +2,7 @@
  * @returns {import('../../../../../typings/index').ComposerConfiguration}
  */
 const composer28 = () => ({
-    version: '2.8.8'
+    version: '2.8.10'
 })
 
 module.exports = composer28

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/container-api.js

@@ -38,9 +38,15 @@ const runCommand = (options) => {
     const portsArgs =
         (ports && ports.length > 0 && ports.map((port) => `-p=${port}`)) || ''
     const mountsArgs =
-        (mounts && mounts.map((mount) => `--mount="${mount}"`)) || ''
+        (mounts &&
+            mounts.map((mount) => `--mount=${mount.replaceAll(' ', '\\ ')}`)) ||
+        ''
     const mountVolumesArgs =
-        (mountVolumes && mountVolumes.map((mount) => `-v="${mount}"`)) || ''
+        (mountVolumes &&
+            mountVolumes.map(
+                (mount) => `-v=${mount.replaceAll(' ', '\\ ')}`
+            )) ||
+        ''
     const envArgs = !env
         ? ''
         : Object.entries(env).map(([key, value]) => `--env=${key}='${value}'`)

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

@@ -142,6 +142,12 @@ const buildDockerFileInstructions = async (
             COMPOSER_HOME: '/composer/home',
             COMPOSER_CACHE_DIR: '/composer/home/cache'
         })
+        .run(
+            `curl https://composer.github.io/snapshots.pub > /composer/home/keys.dev.pub`
+        )
+        .run(
+            `curl https://composer.github.io/releases.pub > /composer/home/keys.tags.pub`
+        )
 
     if (composer.plugins && Object.values(composer.plugins).length > 0) {
         for (const [pluginName, pluginOptions] of Object.entries(

package/lib/tasks/execute.js

@@ -32,6 +32,7 @@ const executeTask = async (argv) => {
             concurrent: false,
             exitOnError: true,
             ctx: { throwMagentoVersionMissing: true },
+            renderer: process.stdout.isTTY ? 'default' : 'silent',
             rendererOptions: { collapse: false, clearOutput: true }
         }
     )
@@ -93,9 +94,9 @@ const executeTask = async (argv) => {
                 )
             }
 
-            const result = await executeInContainer({
+            const result = executeInContainer({
                 containerName: container.name,
-                command: argv.commands.join(' '),
+                commands: argv.commands,
                 user: container.user
             })
 
@@ -113,7 +114,7 @@ const executeTask = async (argv) => {
                 )
             }
 
-            const result = await runInContainer(
+            const result = runInContainer(
                 {
                     ...container,
                     name: `${container.name}_exec-${Date.now()}`

package/lib/tasks/magento/install-magento-project.js

@@ -154,9 +154,9 @@ const createMagentoProject = async (
         ctx,
         `bash -c 'mkdir ${tempDir} && \
 composer ${installCommand.join(' ')} && \
-mv ${tempDir}/composer.json ${
-            ctx.config.baseConfig.containerMagentoDir
-        }/composer.json'`
+mv ${path.join(tempDir, 'composer.json')} ${path
+            .join(ctx.config.baseConfig.containerMagentoDir, 'composer.json')
+            .replaceAll(' ', '\\ ')}'`
     )
 }
 

package/lib/tasks/magento/setup-magento/disable-2fa.js

@@ -1,36 +1,67 @@
 const configPhpToJson = require('../../../util/config-php-json')
-const runMagentoCommand = require('../../../util/run-magento')
+const getJsonfileData = require('../../../util/get-jsonfile-data')
+const path = require('path')
+const composerTask = require('../../../util/composer-task')
+const magentoTask = require('../../../util/magento-task')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
-    title: 'Disabling 2fa for admin',
+    title: 'Disabling 2FA module',
     task: async (ctx, task) => {
-        const { modules } = await configPhpToJson(ctx)
+        // Check if MarkShust module is already installed via composer.lock
+        const composerLockPath = path.join(
+            ctx.config.baseConfig.magentoDir,
+            'composer.lock'
+        )
+        const composerLockData = await getJsonfileData(composerLockPath)
 
-        const isMagentoTFAEnabled =
-            modules.Magento_TwoFactorAuth !== undefined &&
-            modules.Magento_TwoFactorAuth !== 0
+        const tasks = []
 
-        const isMagentoAdminAdobeImsTwoFactorAuthEnabled =
-            modules.Magento_AdminAdobeImsTwoFactorAuth !== undefined &&
-            modules.Magento_AdminAdobeImsTwoFactorAuth !== 0
+        const isModuleInstalled =
+            composerLockData &&
+            composerLockData.packages &&
+            composerLockData.packages.some(
+                /** @param {{ name: string }} pkg */ (pkg) =>
+                    pkg.name ===
+                    'markshust/magento2-module-disabletwofactorauth'
+            )
 
-        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled) {
-            await runMagentoCommand(
-                ctx,
-                'module:disable Magento_AdminAdobeImsTwoFactorAuth'
+        if (!isModuleInstalled) {
+            tasks.push(
+                composerTask(
+                    'require --dev markshust/magento2-module-disabletwofactorauth'
+                )
             )
         }
-        if (isMagentoTFAEnabled) {
-            await runMagentoCommand(ctx, 'module:disable Magento_TwoFactorAuth')
+
+        const getIsModuleEnabled = async () => {
+            const configData = await configPhpToJson(ctx)
+            return (
+                configData &&
+                configData.modules &&
+                configData.modules.MarkShust_DisableTwoFactorAuth !==
+                    undefined &&
+                configData.modules.MarkShust_DisableTwoFactorAuth !== 0
+            )
         }
 
-        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled || isMagentoTFAEnabled) {
+        // Check if module is enabled in Magento
+        const isModuleEnabled =
+            isModuleInstalled || (await getIsModuleEnabled())
+
+        if (!isModuleEnabled) {
+            tasks.push(
+                magentoTask('module:enable MarkShust_DisableTwoFactorAuth'),
+                magentoTask('setup:upgrade')
+            )
+        } else {
+            task.skip()
+
             return
         }
 
-        task.skip()
+        return task.newListr(tasks)
     }
 })

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

@@ -4,6 +4,7 @@ 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')
@@ -56,6 +57,7 @@ const setupMagento = (options = {}) => ({
                 createAdmin(),
                 setDeploymentMode(),
                 disableMaintenanceMode(),
+                disable2fa(),
                 urnHighlighter(),
                 enableFullPageCacheWithVarnish(),
                 magentoTask('cache:flush')

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

@@ -1,11 +1,15 @@
 const { request } = require('smol-request')
 const UnknownError = require('../../errors/unknown-error')
 const waitForLogs = require('../../util/wait-for-logs')
+const { containerApi } = require('../docker/containers')
+const { getPort } = require('../../config/port-config')
+const { createNetwork } = require('../docker/network/tasks')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const checkSearchEngineVersion = () => ({
+    title: 'Retrieving search engine version',
     task: async (ctx, task) => {
         const {
             ports,
@@ -18,52 +22,120 @@ const checkSearchEngineVersion = () => ({
 
         const { elasticsearch } = ctx.config.docker.getContainers(ports)
 
-        await waitForLogs({
-            containerName: elasticsearch.name,
-            matchText:
-                searchengine === 'elasticsearch' ? '"started"' : '] started'
+        // check if container is running
+        // if not running, start temporary container to extract version
+        const containers = await containerApi.ls({
+            filter: `name=${elasticsearch.name}`,
+            formatToJSON: true
         })
+        if (containers.length === 0) {
+            return task.newListr(
+                [
+                    createNetwork(),
+                    {
+                        title: 'Starting temporary container',
+                        task: async (subCtx, subTask) => {
+                            try {
+                                const availablePort = await getPort(
+                                    ports.elasticsearch
+                                )
+                                const searchEngineVersionResponse =
+                                    await containerApi.run({
+                                        ...elasticsearch,
+                                        command:
+                                            searchengine === 'elasticsearch'
+                                                ? 'elasticsearch --version'
+                                                : 'opensearch --version',
+                                        detach: false,
+                                        rm: true,
+                                        ports: [
+                                            `127.0.0.1:${availablePort}:9200`
+                                        ],
+                                        memory: '2gb'
+                                    })
+                                const searchEngineVersionResponseResult =
+                                    searchEngineVersionResponse.match(
+                                        /Version:\s(\d+\.\d+\.\d+)/i
+                                    )
 
-        try {
-            const response = await request(
-                `http://localhost:${ports.elasticsearch}/`,
+                                if (
+                                    searchEngineVersionResponseResult &&
+                                    searchEngineVersionResponseResult.length > 0
+                                ) {
+                                    const searchEngineVersion =
+                                        searchEngineVersionResponseResult[1]
+
+                                    if (searchengine === 'elasticsearch') {
+                                        ctx.elasticSearchVersion =
+                                            searchEngineVersion
+                                    } else {
+                                        ctx.openSearchVersion =
+                                            searchEngineVersion
+                                    }
+
+                                    task.title = `Using ${
+                                        searchengine === 'elasticsearch'
+                                            ? 'ElasticSearch'
+                                            : 'OpenSearch'
+                                    } version ${searchEngineVersion} in container`
+                                }
+                            } catch (e) {
+                                subTask.skip()
+                            }
+                        }
+                    }
+                ],
                 {
-                    method: 'GET',
-                    responseType: 'json'
+                    rendererOptions: {
+                        collapse: true
+                    }
                 }
             )
+        } else {
+            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'
-                ) {
+                if (response.status !== 200) {
+                    if (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(
-                        `OpenSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
+                        `Cannot connect to OpenSearch container!\n\n${e.message}`
                     )
                 } else {
                     throw new UnknownError(
-                        `ElasticSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
+                        `Cannot connect to ElasticSearch container!\n\n${e.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}`
-                )
-            }
         }
     }
 })

package/lib/util/composer-task.js

@@ -0,0 +1,35 @@
+const UnknownError = require('../errors/unknown-error')
+const runComposerCommand = require('./run-composer')
+
+/**
+ * @param {String} command
+ * @param {Object} [options]
+ * @param {(e: Error) => void} [options.onError]
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ */
+const composerTask = (command, options = {}) => ({
+    title: `Running command 'composer ${command}'`,
+    task: async (ctx, task) => {
+        try {
+            await runComposerCommand(ctx, command, {
+                callback: !ctx.verbose
+                    ? undefined
+                    : (t) => {
+                          task.output = t
+                      },
+                throwNonZeroCode: true
+            })
+        } catch (e) {
+            if (e instanceof UnknownError && options.onError) {
+                options.onError(e)
+            }
+
+            throw e
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+})
+
+module.exports = composerTask

package/lib/util/execute-in-container.js

@@ -5,36 +5,36 @@ const {
 } = require('../tasks/docker/containers/container-api')
 
 /**
- * @param {{ containerName: string, command: string, user?: string }} param0
- * @returns {Promise<never>}
+ * @param {{ containerName: string, commands: string[], user?: string }} param0
  */
-const executeInContainer = ({ containerName, command, user }) => {
+const executeInContainer = ({ containerName, commands, user }) => {
     if (!process.stdin.isTTY) {
         process.stderr.write('This app works only in TTY mode')
         process.exit(1)
     }
+    const [commandBin, ...commandsArgs] = commands
 
     const execArgs = execCommand({
         container: containerName,
-        command,
+        command: commandBin,
         user,
         tty: true,
         interactive: true
     })
+    const [command, ...args] = execArgs
 
-    spawn('bash', ['-c', execArgs.join(' ')], {
-        stdio: [0, 1, 2]
+    const child = spawn(command, [...args, ...commandsArgs], {
+        stdio: 'inherit'
     })
 
-    return new Promise((_resolve) => {
-        // never resolve
+    child.on('close', (code) => {
+        process.exit(code)
     })
 }
 
 /**
  * @param {import('../tasks/docker/containers/container-api').ContainerRunOptions} options
  * @param {string[]} commands
- * @returns {Promise<never>}
  */
 const runInContainer = (options, commands) => {
     if (!process.stdin.isTTY) {
@@ -46,14 +46,19 @@ const runInContainer = (options, commands) => {
         ...options,
         tty: true,
         detach: false,
-        rm: true,
-        command: commands.join(' ')
+        rm: true
     })
 
-    spawn('bash', ['-c', runArgs.join(' ')], { stdio: [0, 1, 2] })
+    const [commandBin, ...commandsArgs] = commands
 
-    return new Promise((_resolve) => {
-        // never resolve
+    const [command, ...args] = runArgs
+
+    const child = spawn(command, [...args, commandBin, ...commandsArgs], {
+        stdio: 'inherit'
+    })
+
+    child.on('close', (code) => {
+        process.exit(code)
     })
 }
 

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.3-alpha.0",
     "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": "022a9b630c7a2e226ee10ee3291f547b9545716b"
 }