@scandipwa/magento-scripts 2.0.0-alpha.12 → 2.0.0-alpha.15

package/lib/commands/cli.js

@@ -5,7 +5,6 @@ const getMagentoVersionConfig = require('../config/get-magento-version-config');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
-// const { installComposer, installPrestissimo } = require('../tasks/composer');
 const ConsoleBlock = require('../util/console-block');
 const { checkComposerCredentials } = require('../tasks/requirements/composer-credentials');
 
@@ -70,6 +69,15 @@ module.exports = (yargs) => {
             .addLine(`Connect to MariaDB server as root: ${logger.style.command('mariadbroot')}`)
             .addEmptyLine();
 
+        if (ctx.debug) {
+            block
+                .addLine('Debug PHP in CLI:')
+                .addLine('1. Start debugger in VSCode or PHPStorm')
+                .addLine(`2. Go to PHP container: ${ logger.style.command('exec php') }`)
+                .addLine(`3. Run CLI command with ${ logger.style.code('XDEBUG_SESSION=phpstorm') } environmental variable: ${ logger.style.command('XDEBUG_SESSION=phpstorm magento <command>') }`)
+                .addLine('4. Enjoy');
+        }
+
         block.log();
 
         return cli();

package/lib/config/docker.js

@@ -7,6 +7,7 @@ const systeminformation = require('systeminformation');
 const { deepmerge } = require('../util/deepmerge');
 const defaultEsEnv = require('./services/elasticsearch/default-es-env');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const defaultMagentoUser = require('../tasks/database/default-magento-user');
 
 /**
  *
@@ -248,8 +249,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 image: `${ mariadb.version ? `mariadb:${ mariadb.version }` : mariadb.image }`,
                 name: `${ prefix }_mariadb`,
                 description: `To connect to MariaDB you can use the following users:
-- ${ logger.style.command('root') }@${ logger.style.command('scandipwa') }
-- ${ logger.style.command('magento') }@${ logger.style.command('magento') }`
+- User ${ logger.style.command('root') } with password ${ logger.style.command('scandipwa') }
+- User ${ logger.style.command(defaultMagentoUser.user) } with password ${ logger.style.command(defaultMagentoUser.password) }`
             },
             elasticsearch: {
                 _: 'ElasticSearch',
@@ -271,7 +272,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             }
         };
 
-        if (ssl.enabled) {
+        if (ssl.enabled && isDockerDesktop) {
             dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             );
@@ -302,7 +303,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 command: `/bin/bash -c "varnishd -a :${ isDockerDesktop ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s Cache=malloc,2048m -s Transient=malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
-                ]
+                ],
+                description: `Varnish HealthCheck status: ${ logger.style.command(varnish.healthCheck ? 'enabled' : 'disabled') }`
             };
         }
 

package/lib/config/get-project-configuration.js

@@ -1,3 +1,4 @@
+const { getProjectConfig } = require('./config');
 const { getConfigFromMagentoVersion } = require('./index');
 
 /**
@@ -8,6 +9,10 @@ const getProjectConfiguration = () => ({
     task: async (ctx) => {
         const { magentoVersion } = ctx;
 
+        if (typeof ctx.debug !== 'boolean') {
+            ctx.debug = getProjectConfig().debug;
+        }
+
         ctx.config = await getConfigFromMagentoVersion(ctx, {
             magentoVersion
         });

package/lib/config/index.js

@@ -9,6 +9,7 @@ const { getMagentoConfig } = require('./magento-config');
 const resolveConfigurationWithOverrides = require('../util/resolve-configuration-with-overrides');
 const { getPrefix, folderName } = require('../util/prefix');
 const UnknownError = require('../errors/unknown-error');
+const { getProjectConfig } = require('./config');
 
 const platforms = ['linux', 'darwin'];
 const darwinMinimalVersion = '10.5';
@@ -33,7 +34,11 @@ const magento = {
 
 module.exports = {
     /**
-     * @param {string} magentoVersion
+     * @param {import('../../typings/context')} ctx
+     * @param {Object} param1
+     * @param {String} [param1.magentoVersion]
+     * @param {String} [param1.projectPath]
+     * @param {String} [param1.prefix]
      */
     async getConfigFromMagentoVersion(ctx, {
         magentoVersion,
@@ -45,6 +50,7 @@ module.exports = {
         if (!configurations[magentoVersion]) {
             throw new UnknownError(`No config found for magento version ${magentoVersion}`);
         }
+        const projectConfig = getProjectConfig();
 
         const {
             overridenConfiguration,
@@ -62,7 +68,8 @@ module.exports = {
             baseConfig: newBaseConfig,
             overridenConfiguration,
             userConfiguration,
-            nonOverridenConfiguration: configurations[magentoVersion]
+            nonOverridenConfiguration: configurations[magentoVersion],
+            projectConfig
         };
     },
     baseConfig,

package/lib/config/templates/php.template.ini

@@ -1813,7 +1813,7 @@ ldap.max_links = -1
 [opcache]
 opcache.enable=1
 opcache.revalidate_freq=0
-opcache.validate_timestamps=0
+opcache.validate_timestamps=1
 opcache.max_accelerated_files=100000
 opcache.memory_consumption=192
 opcache.max_wasted_percentage=10

package/lib/tasks/cli/create-bashrc-config.js

@@ -21,7 +21,7 @@ const createBashrcConfigFile = () => ({
                 }
             });
         } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during php.ini config creation\n\n${e}`);
+            throw new UnknownError(`Unexpected error accrued during .magentorc config creation\n\n${e}`);
         }
     }
 });

package/lib/tasks/docker/containers/container-api.d.ts

@@ -144,3 +144,6 @@ export interface ContainerLogsOptions<T = never> {
 
 export function logs(options?: ContainerLogsOptions, execOptions?: ExecAsyncSpawnOptions<false>): Promise<string>
 export function logs<T>(options?: ContainerLogsOptions<T>, execOptions?: ExecAsyncSpawnOptions<false>): Promise<T[]>
+
+export function stop(containers: string[], execOptions: ExecAsyncSpawnOptions<false>): Promise<string>
+export function rm(containers: string[], execOptions: ExecAsyncSpawnOptions<false>): Promise<string>

package/lib/tasks/docker/containers/container-api.js

@@ -34,15 +34,15 @@ const runCommand = (options) => {
     const exposeArg = expose && expose.map((e) => `--expose=${ e }`);
     const restartArg = !rm && restart && `--restart=${ restart }`;
     const networkArg = network && `--network=${ network }`;
-    const portsArgs = ports && ports.length > 0 && ports.map((port) => `-p=${ port }`).join(' ');
-    const mountsArgs = mounts && mounts.map((mount) => `--mount=${ mount }`).join(' ');
-    const mountVolumesArgs = mountVolumes && mountVolumes.map((mount) => `-v=${mount}`).join(' ');
-    const envArgs = !env ? '' : Object.entries(env).map(([key, value]) => `--env=${ key }='${ value }'`).join(' ');
+    const portsArgs = ports && ports.length > 0 && ports.map((port) => `-p=${ port }`);
+    const mountsArgs = mounts && mounts.map((mount) => `--mount=${ mount }`);
+    const mountVolumesArgs = mountVolumes && mountVolumes.map((mount) => `-v=${mount}`);
+    const envArgs = !env ? '' : Object.entries(env).map(([key, value]) => `--env=${ key }='${ value }'`);
     const nameArg = name && `--name=${name}`;
     const entrypointArg = entrypoint && `--entrypoint="${entrypoint}"`;
-    const healthCheckArg = healthCheck && Object.entries(healthCheck).map(([key, value]) => `--health-${key}='${value}'`).join(' ');
-    const securityArg = securityOptions.length > 0 && securityOptions.map((opt) => `--security-opt=${opt}`).join(' ');
-    const tmpfsArg = tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs=${t}`).join(' ');
+    const healthCheckArg = healthCheck && Object.entries(healthCheck).map(([key, value]) => `--health-${key}='${value}'`);
+    const securityArg = securityOptions.length > 0 && securityOptions.map((opt) => `--security-opt=${opt}`);
+    const tmpfsArg = tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs=${t}`);
     const userArg = user && `--user=${user}`;
     const addHostArg = addHost && `--add-host=${addHost}`;
 
@@ -68,7 +68,7 @@ const runCommand = (options) => {
         addHostArg,
         image,
         command
-    ].filter(Boolean).filter((arg) => typeof arg === 'string');
+    ].flat().filter(Boolean).filter((arg) => typeof arg === 'string');
 
     return dockerCommand;
 };
@@ -203,10 +203,16 @@ const logs = async (options = {}, execOptions = {}) => {
     return execAsyncSpawn(logsCommand, execOptions);
 };
 
+const stop = (containers, execOptions = {}) => execAsyncSpawn(`docker container stop ${containers.join(' ')}`, execOptions);
+
+const rm = (containers, execOptions = {}) => execAsyncSpawn(`docker container rm ${containers.join(' ')}`, execOptions);
+
 module.exports = {
     run,
     runCommand,
     exec,
     ls,
-    logs
+    logs,
+    stop,
+    rm
 };

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

@@ -6,9 +6,9 @@ const containerApi = require('./container-api');
 const { imageApi } = require('../image');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 
-const stop = async (containers) => {
-    await execAsyncSpawn(`docker container stop ${containers.join(' ')}`);
-    await execAsyncSpawn(`docker container rm ${containers.join(' ')}`);
+const stopAndRemoveContainers = async (containers) => {
+    await containerApi.stop(containers);
+    await containerApi.rm(containers);
 };
 
 const pull = async (image) => execAsyncSpawn(`docker pull ${image}`);
@@ -116,10 +116,10 @@ const pullImages = () => ({
 const startContainers = () => ({
     title: 'Starting containers',
     task: async ({ ports, config: { docker }, debug }, task) => {
-        const containerList = (await execAsyncSpawn('docker container ls --all --format="{{.Names}}"')).split('\n');
+        const containerList = await containerApi.ls({ formatToJSON: true, all: true });
 
         const missingContainers = Object.values(docker.getContainers(ports)).filter(
-            ({ name }) => !containerList.includes(name)
+            ({ name }) => !containerList.some((c) => c.Names === name)
         );
 
         if (missingContainers.length === 0) {
@@ -160,22 +160,22 @@ const startContainers = () => ({
 const stopContainers = () => ({
     title: 'Stopping Docker containers',
     task: async ({ config: { baseConfig: { prefix } } }, task) => {
-        const containerList = (await execAsyncSpawn('docker container ls --all --format="{{.Names}}"')).split('\n');
+        const containerList = await containerApi.ls({ formatToJSON: true, all: true });
 
-        const runningContainers = containerList.filter((containerName) => containerName.startsWith(prefix));
+        const runningContainers = containerList.filter((containerName) => containerName.Names.startsWith(prefix));
 
         if (runningContainers.length === 0) {
             task.skip();
             return;
         }
 
-        await stop(runningContainers);
+        await stopAndRemoveContainers(runningContainers.map(({ Names }) => Names));
     }
 });
 
 const getContainerStatus = async (containerName) => {
     try {
-        return JSON.parse(await execAsyncSpawn(`docker inspect --format='{{json .State}}' ${containerName}`));
+        return JSON.parse(await execAsyncSpawn(`docker inspect --format='{{json .}}' ${containerName}`));
     } catch {
         return null;
     }
@@ -198,11 +198,11 @@ const checkContainersAreRunning = () => ({
                 }))
             );
 
-            if (containersWithStatus.some((c) => c.status.Status !== 'running')) {
+            if (containersWithStatus.some((c) => c.status.State.Status !== 'running')) {
                 if (tries === 2) {
-                    throw new KnownError(`${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} containers are not running! Please check container logs for more details!`);
+                    throw new KnownError(`${containersWithStatus.filter((c) => c.status.State.Status !== 'running').map((c) => c._).join(', ')} containers are not running! Please check container logs for more details!`);
                 } else {
-                    task.output = `${containersWithStatus.filter((c) => c.status.Status !== 'running').map((c) => c._).join(', ')} are not running, waiting if something will change...`;
+                    task.output = `${containersWithStatus.filter((c) => c.status.State.Status !== 'running').map((c) => c._).join(', ')} are not running, waiting if something will change...`;
                     await sleep(2000);
                     tries++;
                 }

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

@@ -5,7 +5,6 @@ const { volumeApi, createVolumes } = require('./volume');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const { containerApi, stopContainers, pullImages } = require('./containers');
 const { importDumpToDatabase, connectToDatabase } = require('../database');
-const { setPrefix } = require('../prefix');
 const getProjectConfiguration = require('../../config/get-project-configuration');
 const { getAvailablePorts, getCachedPorts } = require('../../config/get-port-config');
 const { saveConfiguration } = require('../../config/save-config');
@@ -21,6 +20,7 @@ const KnownError = require('../../errors/known-error');
 const { createCacheFolder } = require('../cache');
 const { getSystemConfigTask } = require('../../config/system-config');
 const sleep = require('../../util/sleep');
+const { setProjectConfigTask } = require('../project-config');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -203,7 +203,7 @@ Please wait, this will take some time and do not restart the MySQL container unt
                     getSystemConfigTask(),
                     getCachedPorts(),
                     stopContainers(),
-                    setPrefix(),
+                    setProjectConfigTask(),
                     getProjectConfiguration(),
                     // get fresh ports
                     getAvailablePorts(),

package/lib/tasks/docker/image/image-api.d.ts

@@ -32,3 +32,47 @@ export function ls(
     options?: ImagesLsOptions<true>,
     execOptions?: ExecAsyncSpawnOptions<false>
 ): Promise<ImagesLsResult[]>
+
+export interface ImagesInspectOptions<T extends boolean = false> {
+    image: string
+    format?: string
+    formatToJSON?: T
+}
+
+export interface ImagesInspectResult {
+    Id: string
+    RepoTags: string[]
+    RepoDigests: string[]
+    Parent: string
+    Comment: string
+    Created: string
+    Container: string
+    ContainerConfig: unknown
+    DockerVersion: string
+    Author: string
+    Config: {
+        Env: string[],
+        Cmd: string[]
+        WorkingDir: string
+        Entrypoint: string[]
+        StopSignal: string
+    }
+    Architecture: string
+    Os: string
+    Size: number
+    VirtualSize: number
+    GraphDriver: unknown
+    RootFs: unknown
+    Metadata: Record<string, unknown>
+    CreatedTime: number
+    Container: Record<string, unknown>
+}
+
+export function inspect(
+    options?: ImagesInspectOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>
+export function inspect(
+    options?: ImagesInspectOptions<true>,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<ImagesInspectResult>

package/lib/tasks/docker/image/image-api.js

@@ -1,7 +1,6 @@
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 
 /**
- *
  * @param {import('./image-api').ImagesLsOptions} options
  * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
  */
@@ -44,6 +43,35 @@ const ls = async (options, execOptions = {}) => {
     return execAsyncSpawn(`docker image ls ${args}`, execOptions);
 };
 
+/**
+ * @param {import('./image-api').ImagesInspectOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const inspect = async (options, execOptions = {}) => {
+    const {
+        image,
+        format,
+        formatToJSON = false
+    } = options;
+
+    const formatArg = !formatToJSON && format
+        ? `--format=${format}`
+        : formatToJSON && '--format=\'{{json .}}\'';
+
+    const args = [
+        formatArg,
+        image
+    ].filter(Boolean).join(' ');
+
+    if (formatToJSON) {
+        const result = await execAsyncSpawn(`docker image inspect ${args}`, execOptions);
+        return JSON.parse(result);
+    }
+
+    return execAsyncSpawn(`docker image inspect ${args}`, execOptions);
+};
+
 module.exports = {
-    ls
+    ls,
+    inspect
 };

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

@@ -1,8 +1,10 @@
+const path = require('path');
 const { DockerFileBuilder } = require('../../util/dockerfile-builder');
 const semver = require('semver');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const KnownError = require('../../errors/known-error');
 const { runContainerImage } = require('../../util/run-container-image');
+const { imageApi } = require('./image');
 
 /**
  * Get enabled extensions list with versions
@@ -49,6 +51,7 @@ const addExtensionToBuilder = (builder, ctx) => async ([extensionName, extension
 const buildDockerFileInstructions = async (ctx, { image, tag }) => {
     const { composer } = ctx.config.overridenConfiguration.configuration;
     const existingPHPExtensions = await getEnabledExtensionsFromImage(`${image}:${tag}`);
+    const imageDetails = await imageApi.inspect({ image: `${image}:${tag}`, formatToJSON: true });
 
     const missingExtensions = Object.entries(
         ctx.config.overridenConfiguration.configuration.php.extensions
@@ -101,6 +104,13 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
     dockerFileInstructions
         .workDir(ctx.config.baseConfig.containerMagentoDir);
 
+    const imagePathEnv = imageDetails.Config.Env.find((env) => env.startsWith('PATH'));
+
+    dockerFileInstructions
+        .env({
+            PATH: `${ imagePathEnv.split('=').pop() }:${ path.join(ctx.config.baseConfig.containerMagentoDir, 'bin') }`
+        });
+
     return dockerFileInstructions;
 };
 

package/lib/tasks/docker/volume/tasks.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const pathExists = require('../../../util/path-exists');
+const { containerApi } = require('../containers');
 const volumeApi = require('./volume-api');
 
 /**
@@ -78,6 +79,18 @@ const removeLocalVolumes = () => ({
         );
 
         if (existingLocalVolumes.length > 0) {
+            const existingLocalVolumesDetails = await Promise.all(
+                existingLocalVolumes.map((v) => volumeApi.inspect({ volume: v.name, formatToJSON: true }))
+            );
+
+            await Promise.all(existingLocalVolumesDetails.map(async (v) => {
+                if (v.Containers && Object.entries(v.Containers).length > 0) {
+                    await Promise.all(Object.values(v.Containers).map(async (c) => {
+                        await containerApi.stop(c.Name);
+                        await containerApi.rm(c.Name);
+                    }));
+                }
+            }));
             await volumeApi.rm({
                 volumes: existingLocalVolumes.map((volume) => volume.name)
             });

package/lib/tasks/docker/volume/volume-api.d.ts

@@ -47,3 +47,33 @@ export function rm(
     options?: VolumeRmOptions,
     execOptions?: ExecAsyncSpawnOptions<false>
 ): Promise<string>
+
+export interface VolumeInspectOptions<T extends boolean = false> {
+    volume: string
+    format?: string
+    formatToJSON?: T
+}
+
+export interface VolumeInspectResult {
+    CreatedAt: string
+    Driver: string
+    Labels: unknown
+    Mountpoint: string
+    Name: string
+    Options: unknown
+    Scope: string
+    CreatedTime: number
+    Containers: Record<string, {
+        Name: string
+        Destination: string
+    }>
+}
+
+export function inspect(
+    options?: VolumeInspectOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>
+export function inspect(
+    options?: VolumeInspectOptions<true>,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<VolumeInspectResult>

package/lib/tasks/docker/volume/volume-api.js

@@ -83,8 +83,37 @@ const rm = async (options, execOptions = {}) => {
     return execAsyncSpawn(command, execOptions);
 };
 
+/**
+ * @param {import('./volume-api').VolumeInspectOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const inspect = async (options, execOptions = {}) => {
+    const {
+        image: volume,
+        format,
+        formatToJSON = false
+    } = options;
+
+    const formatArg = !formatToJSON && format
+        ? `--format=${format}`
+        : formatToJSON && '--format=\'{{json .}}\'';
+
+    const args = [
+        formatArg,
+        volume
+    ].filter(Boolean).join(' ');
+
+    if (formatToJSON) {
+        const result = await execAsyncSpawn(`docker volume inspect ${args}`, execOptions);
+        return JSON.parse(result);
+    }
+
+    return execAsyncSpawn(`docker volume inspect ${args}`, execOptions);
+};
+
 module.exports = {
     create,
     ls,
-    rm
+    rm,
+    inspect
 };

package/lib/tasks/{prefix → project-config}/index.js

@@ -1,21 +1,21 @@
+const { setProjectConfig } = require('../../config/config');
 const { setPrefix: setPrefixUtil } = require('../../util/prefix');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const setPrefix = () => ({
-    // if project is missing prefix, set one
-    title: 'Settings project prefix',
+const setProjectConfigTask = () => ({
+    title: 'Settings project config',
     task: (ctx) => {
         const { config: { overridenConfiguration: { prefix } } } = ctx;
 
         setPrefixUtil(prefix);
+
+        setProjectConfig('debug', ctx.debug);
     },
     options: {
         showTimer: false
     }
 });
 
-module.exports = {
-    setPrefix
-};
+module.exports = { setProjectConfigTask };

package/lib/tasks/requirements/docker/index.js

@@ -1,3 +1,4 @@
+const os = require('os');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { cmaGlobalConfig } = require('../../../config/cma-config');
 const KnownError = require('../../../errors/known-error');
@@ -10,12 +11,13 @@ const { checkDockerPerformance } = require('./performance');
 const { checkDockerSocketPermissions } = require('./permissions');
 const { checkDockerStatus, getDockerEngineAndDesktopServiceStatus } = require('./running-status');
 const getDockerVersion = require('./version');
+const getIsWsl = require('../../../util/is-wsl');
 
 const USE_DOCKER_ENGINE_WITH_DOCKER_DESKTOP_ANSWER = 'useDockerEngineWithDockerDesktop';
 
 const setVersionInContextTask = (task) => ({
     task: (ctx) => {
-        if (ctx.platform === 'darwin' && ctx.dockerServerData && ctx.dockerServerData.Platform && ctx.dockerServerData.Platform.Name) {
+        if (os.platform() === 'darwin' && ctx.dockerServerData && ctx.dockerServerData.Platform && ctx.dockerServerData.Platform.Name) {
             task.title = `Using ${ctx.dockerServerData.Platform.Name} for Mac`;
         } else {
             task.title = `Using Docker version ${ctx.dockerVersion}`;
@@ -152,8 +154,9 @@ const checkDocker = () => ({
         });
 
         if (code !== 0) {
-            if (ctx.platform === 'linux') {
-                if (!ctx.isWsl) {
+            if (os.platform() === 'linux') {
+                const isWsl = await getIsWsl();
+                if (!isWsl) {
                     const { engine } = await getDockerEngineAndDesktopServiceStatus();
                     if (!engine.exists) {
                         const result = await dockerInstallPromptLinux(task);
@@ -161,7 +164,7 @@ const checkDocker = () => ({
                             return result;
                         }
                     }
-                } else if (ctx.isWsl) {
+                } else if (isWsl) {
                     dockerInstallPromptWindows();
                 }
             } else {
@@ -170,7 +173,7 @@ const checkDocker = () => ({
                     return result;
                 }
             }
-        } else if (ctx.platform === 'linux') {
+        } else if (os.platform() === 'linux') {
             const { engine, desktop } = await getDockerEngineAndDesktopServiceStatus();
             if (!engine.exists
                 && desktop.exists

package/lib/tasks/start.js

@@ -11,7 +11,6 @@ const { prepareFileSystem } = require('./file-system');
 const { installMagentoProject, setupMagento } = require('./magento');
 const { pullImages, stopContainers } = require('./docker/containers');
 const dockerNetwork = require('./docker/network');
-const { setPrefix } = require('./prefix');
 const { connectToDatabase } = require('./database');
 const { buildProjectImage, buildDebugProjectImage } = require('./docker/project-image-builder');
 const getProjectConfiguration = require('../config/get-project-configuration');
@@ -29,6 +28,7 @@ const checkPHPVersion = require('./requirements/php-version');
 const volumes = require('./docker/volume/tasks');
 const convertMySQLDatabaseToMariaDB = require('./docker/convert-mysql-to-mariadb');
 const { cmaGlobalConfig } = require('../config/cma-config');
+const { setProjectConfigTask } = require('./project-config');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -83,7 +83,7 @@ const stopProject = () => ({
 const retrieveFreshProjectConfiguration = () => ({
     title: 'Retrieving fresh project configuration',
     task: (ctx, task) => task.newListr([
-        setPrefix(),
+        setProjectConfigTask(),
         getProjectConfiguration(),
         // get fresh ports
         getAvailablePorts(),
@@ -111,12 +111,7 @@ const configureProject = () => ({
                 dockerNetwork.tasks.createNetwork()
             ], { concurrent: true })
         },
-        {
-            task: (ctx, task) => task.newListr([
-                checkPHPVersion(),
-                getComposerVersionTask()
-            ], { concurrent: true })
-        },
+        checkPHPVersion(),
         {
             task: (ctx, task) => task.newListr([
                 buildProjectImage(),
@@ -125,6 +120,7 @@ const configureProject = () => ({
                 concurrent: true
             })
         },
+        getComposerVersionTask(),
         prepareFileSystem(),
         volumes.createVolumes(),
         installMagentoProject(),

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.12",
+    "version": "2.0.0-alpha.15",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "8dd4c7148b86e5190bea50579b97375a2f1aee2d"
+    "gitHead": "df32030f4809af581a3ff909f215d31f74bc0207"
 }

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