@scandipwa/magento-scripts 2.3.2 → 2.3.3

package/lib/config/docker.js

@@ -365,6 +365,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 env:
                     searchengine === 'elasticsearch'
                         ? deepmerge(
+                              defaultEsEnv,
                               {
                                   // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
                                   'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some(
@@ -372,9 +373,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                                           cpuSupportedFlags.includes(sse42Flag)
                                   )
                               },
-                              elasticsearch.env || defaultEsEnv
+                              elasticsearch.env || {}
                           )
-                        : deepmerge({}, opensearch.env || defaultOsEnv),
+                        : deepmerge(defaultOsEnv, opensearch.env || {}),
                 network: network.name,
                 image: `${
                     searchengine === 'elasticsearch'

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

@@ -45,15 +45,10 @@ const addExtensionToBuilder =
         let runCommand = ''
         if (typeof command === 'string') {
             runCommand += ` ${command}`
-        } else if (command instanceof Promise) {
+        } else if (typeof command === 'function') {
             runCommand += ` ${await Promise.resolve(
                 command({ ...extensionInstructionsWithoutCommand, ctx })
             )}`
-        } else if (typeof command === 'function') {
-            runCommand += ` ${command({
-                ...extensionInstructionsWithoutCommand,
-                ctx
-            })}`
         } else {
             runCommand += ` docker-php-ext-install ${
                 extensionInstructionsWithoutCommand.name || extensionName
@@ -146,14 +141,17 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
             composer.plugins
         )) {
             if (pluginOptions.enabled) {
+                const pluginVersion = pluginOptions.version
                 dockerFileInstructions
-                    .comment(`install ${pluginName} composer global package`)
+                    .comment(
+                        `install ${pluginName}${
+                            pluginVersion ? ` (version ${pluginVersion})` : ''
+                        } composer global package`
+                    )
 
                     .run(
                         `composer global require ${pluginName}${
-                            pluginOptions.options
-                                ? ` ${pluginOptions.options}`
-                                : ''
+                            pluginVersion ? `:${pluginVersion}` : ''
                         }${
                             pluginOptions.options
                                 ? ` ${pluginOptions.options}`

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

@@ -1,3 +1,4 @@
+const { getPort } = require('../../config/port-config')
 const UnknownError = require('../../errors/unknown-error')
 const { containerApi } = require('../docker/containers')
 
@@ -11,19 +12,40 @@ const checkElasticSearchVersion = () => ({
             ctx.config.overridenConfiguration.configuration
         const { ports } = ctx
 
+        const { elasticsearch: elasticSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
         let elasticSearchVersionResponse
 
-        try {
-            elasticSearchVersionResponse = await containerApi.run({
-                ...elasticsearch,
-                command: 'elasticsearch --version',
-                detach: false,
-                rm: true,
-                ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
-                memory: '512mb'
-            })
-        } catch (e) {
-            elasticSearchVersionResponse = e.message
+        const elasticSearchContainerRunning = await containerApi.ls({
+            filter: `name=${elasticSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            elasticSearchContainerRunning.length !== 0 &&
+            elasticSearchContainerRunning[0].State === 'running'
+        ) {
+            elasticSearchVersionResponse = await containerApi.exec(
+                'elasticsearch --version',
+                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: '512mb'
+                })
+            } catch (e) {
+                elasticSearchVersionResponse = e.message
+            }
         }
 
         const elasticSearchVersionResponseResult =

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

@@ -1,3 +1,4 @@
+const { getPort } = require('../../config/port-config')
 const UnknownError = require('../../errors/unknown-error')
 const { containerApi } = require('../docker/containers')
 
@@ -10,19 +11,40 @@ const checkOpenSearchVersion = () => ({
         const { opensearch } = ctx.config.overridenConfiguration.configuration
         const { ports } = ctx
 
+        const { elasticsearch: openSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
         let openSearchVersionResponse
 
-        try {
-            openSearchVersionResponse = await containerApi.run({
-                ...opensearch,
-                command: 'opensearch --version',
-                detach: false,
-                rm: true,
-                ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
-                memory: '512mb'
-            })
-        } catch (e) {
-            openSearchVersionResponse = e.message
+        const openSearchContainerRunning = await containerApi.ls({
+            filter: `name=${openSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            openSearchContainerRunning.length !== 0 &&
+            openSearchContainerRunning[0].State === 'running'
+        ) {
+            openSearchVersionResponse = await containerApi.exec(
+                'opensearch --version',
+                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: '512mb'
+                })
+            } catch (e) {
+                openSearchVersionResponse = e.message
+            }
         }
 
         const openSearchVersionResponseResult = openSearchVersionResponse.match(

package/lib/tasks/status/index.js

@@ -105,12 +105,17 @@ const prettyStatus = async (ctx) => {
         if (
             container.status &&
             container.status.State &&
-            container.status.State.Health
+            container.status.State.Health &&
+            container.status.State.Status === 'running'
         ) {
             containerStatus = `✓ ${logger.style.file(
                 container.status.State.Health.Status
             )} and ${logger.style.file('running')}`
-        } else if (container.status && container.status.State) {
+        } else if (
+            container.status &&
+            container.status.State &&
+            container.status.State.Status !== 'exited'
+        ) {
             containerStatus = logger.style.file(container.status.State.Status)
         } else {
             containerStatus = '✖ Not running'

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.3.2",
+    "version": "2.3.3",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.10.4",
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "da589ac8f9aa56f6489c7b12d69e4cddaa617f36"
+    "gitHead": "041e92f309c8e1d513f8d12aacd8d262b302d905"
 }

package/typings/context.d.ts

@@ -91,7 +91,7 @@ export interface ListrContext {
                     }
                 }
             >
-            getContainers(ports?: Record<string, number>): Record<string,
+            getContainers(ports?: ListrContext['ports']): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mariadb' | 'elasticsearch' | 'maildev' | 'varnish',
                 {
                     _: string
                     ports: string[]