@scandipwa/magento-scripts 2.4.1 → 2.4.2-alpha.1

package/lib/config/docker.js

@@ -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[] }>}
+         * @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 }>}
          */
         const dockerConfig = {
             php: {
@@ -169,7 +169,8 @@ 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',
@@ -228,7 +229,8 @@ 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)',
@@ -337,7 +339,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     redis.version ? `redis:${redis.version}` : redis.image
                 }`,
                 name: `${prefix}_redis`,
-                connectCommand: ['redis-cli']
+                connectCommand: ['redis-cli'],
+                serviceReadyLog: 'Ready to accept connections'
             },
             mariadb: {
                 _: 'MariaDB',
@@ -423,7 +426,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                             : elasticsearch.image
                         : opensearch.image
                 }`,
-                name: `${prefix}_${searchengine}`
+                name: `${prefix}_${searchengine}`,
+                serviceReadyLog:
+                    searchengine === 'elasticsearch' ? '"started"' : '] started'
             },
             maildev: {
                 _: 'MailDev',

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

@@ -5,6 +5,7 @@ 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
@@ -154,7 +155,9 @@ const startContainers = () => ({
             all: true
         })
 
-        const missingContainers = Object.entries(docker.getContainers(ports))
+        const containers = docker.getContainers(ports)
+
+        const missingContainers = Object.entries(containers)
             .filter(
                 ([nameWithoutPrefix, { name }]) =>
                     !containerList.some((c) => c.Names === name)
@@ -189,7 +192,9 @@ const startContainers = () => ({
                         const startedContainers = []
                         subTask.title = `Container ${
                             container._
-                        } is waiting for ${dependsOn.join(', ')} to start...`
+                        } is waiting for ${dependsOn
+                            .map((a) => containers[a]._)
+                            .join(', ')} to start...`
                         await Promise.all(
                             dependsOn.map(
                                 async (name) =>
@@ -217,6 +222,7 @@ const startContainers = () => ({
                                                                 d
                                                             )
                                                     )
+                                                    .map((d) => containers[d]._)
                                                     .join(', ')} to start...`
                                                 clearTimeout(timeout)
                                                 resolve()
@@ -231,6 +237,13 @@ const startContainers = () => ({
 
                     await containerApi.run(container)
 
+                    if (container.serviceReadyLog) {
+                        await waitForLogs({
+                            containerName: container.name,
+                            matchText: container.serviceReadyLog
+                        })
+                    }
+
                     containerStatuses[
                         container.nameWithoutPrefix
                     ].started = true
@@ -240,7 +253,7 @@ const startContainers = () => ({
                         cb()
                     })
 
-                    subTask.output = `${container._} container started`
+                    subTask.title = `${container._} container started`
                 }
             })),
             {

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

@@ -28,13 +28,16 @@ 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.fpmPort = 9000
-            networkSettings.fpmXdebugPort = 9000
+            networkSettings.phpNetwork = 'host.docker.internal'
+            networkSettings.phpWithXdebugNetwork = 'host.docker.internal'
+
+            // networkSettings.fpmPort = 9000
+            // networkSettings.fpmXdebugPort = 9000
 
             networkSettings.hostPort = 80
         }

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.1",
+    "version": "2.4.2-alpha.1",
     "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": "54272cb4f12f8684d032dd611027ec4fe3877cab"
+    "gitHead": "96732295d12ac0fc5cf37a70aaeec93fb85503d7"
 }

package/typings/context.d.ts

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