@scandipwa/magento-scripts 2.0.0-alpha.13 → 2.0.0-alpha.16

package/lib/tasks/status/index.js

@@ -28,7 +28,8 @@ const parsePort = (port) => {
 const prettyStatus = async (ctx) => {
     const {
         config: {
-            baseConfig
+            baseConfig,
+            projectConfig
         },
         magentoVersion,
         dockerVersion,
@@ -48,7 +49,7 @@ const prettyStatus = async (ctx) => {
     block
         .addHeader(`magento-scripts version: ${ logger.style.link(packageVersion) }`)
         .addEmptyLine()
-        .addLine(`Project: ${logger.style.file(baseConfig.prefix)} ${prefix === folderName ? '(without prefix)' : '(with prefix)'} (with php container)`)
+        .addLine(`Project: ${logger.style.file(baseConfig.prefix)} ${prefix === folderName ? '(without prefix)' : '(with prefix)'} (with php container)${ projectConfig.debug ? ' (with debugging)' : '' }`)
         .addLine(`Project location: ${logger.style.link(process.cwd())}`);
 
     if (projectCreatedAt) {
@@ -74,19 +75,25 @@ const prettyStatus = async (ctx) => {
 
         let containerStatus;
 
-        if (container.status && container.status.Health) {
-            containerStatus = `✓ ${ logger.style.file(container.status.Health.Status) } and ${ logger.style.file('running') }`;
-        } else if (container.status) {
-            containerStatus = logger.style.file(container.status.Status);
+        if (container.status && container.status.State && container.status.State.Health) {
+            containerStatus = `✓ ${ logger.style.file(container.status.State.Health.Status) } and ${ logger.style.file('running') }`;
+        } else if (container.status && container.status.State) {
+            containerStatus = logger.style.file(container.status.State.Status);
         } else {
             containerStatus = '✖ Not running';
         }
 
         block
             .addLine(`Status: ${containerStatus}`)
-            .addLine(`Name: ${logger.style.misc(container.name)}`)
-            .addLine(`Image: ${logger.style.file(container.image)}`)
-            .addLine(`Network: ${logger.style.link(container.network)}`);
+            .addLine(`Name: ${logger.style.misc(container.name)}`);
+
+        if (container.status && container.status.Config && container.status.Config.Image) {
+            block.addLine(`Image: ${logger.style.file(container.status.Config.Image)}`);
+        } else {
+            block.addLine(`Image: ${logger.style.file(container.image)}`);
+        }
+
+        block.addLine(`Network: ${logger.style.link(container.network)}`);
 
         if (!containerStatus.includes('Not running') && container.forwardedPorts && container.forwardedPorts.length > 0) {
             block.addLine('Port forwarding:');

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.0.0-alpha.13",
+    "version": "2.0.0-alpha.16",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "92a6255dbb6fb46334c0677be8f1ff2c7adab56f"
+    "gitHead": "04c17be45e2a405c9ae08858de49d3232a5f8037"
 }

package/typings/context.d.ts

@@ -1,5 +1,6 @@
 import mysql2 from 'mysql2';
 
+import { ProjectConfig } from '../lib/config/config';
 import { DockerVersionResult } from '../lib/tasks/docker/api';
 import { CMAConfiguration, PHPExtensions } from './index';
 import { PHPStormConfig } from './phpstorm';
@@ -86,6 +87,7 @@ export interface ListrContext {
         userConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
         nonOverridenConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
         phpStorm: PHPStormConfig
+        projectConfig: ProjectConfig
     }
     systemConfiguration: {
         analytics: boolean