@scandipwa/magento-scripts 1.16.1 → 2.0.0-alpha.10

package/exec.js

@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+
+const getLatestVersion = require('@scandipwa/scandipwa-dev-utils/latest-version');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const semver = require('semver');
+const isInstalledGlobally = require('is-installed-globally');
+const isRunningRoot = require('./lib/util/is-running-root');
+const { executeTask } = require('./lib/tasks/execute');
+
+if (isRunningRoot()) {
+    logger.error('Root privileges detected!');
+    console.log(`
+We detected that you are running ${ logger.style.misc('magento-scripts') } as root user.
+We cannot allow you to run ${ logger.style.misc('magento-scripts') } with root privileges, this will only cause more problems.
+
+If you are experiencing problems with ${ logger.style.misc('Docker') } or ${ logger.style.misc('Magento') } setup, running ${ logger.style.misc('magento-scripts') } as root will not solve those problems.
+`);
+
+    process.exit(1);
+}
+
+process.title = 'magento-scripts';
+
+const newVersionIsAPatch = (latestVersion, currentVersion) => {
+    const latestVersionParsed = semver.parse(latestVersion);
+    const currentVersionParsed = semver.parse(currentVersion);
+
+    return latestVersionParsed.major === currentVersionParsed.major
+    && latestVersionParsed.minor === currentVersionParsed.minor
+    && latestVersionParsed.patch !== currentVersionParsed.patch;
+};
+
+(async () => {
+    const { version: currentVersion, name } = require('./package.json');
+    try {
+        const latestVersion = await getLatestVersion(name);
+
+        if (semver.gt(latestVersion, currentVersion)) {
+            const isNewVersionAPath = newVersionIsAPatch(latestVersion, currentVersion);
+
+            let message = [];
+
+            if (isNewVersionAPath) {
+                message = [
+                    `A patch for ${ logger.style.misc(name) } is available!`,
+                    `We recommend to update to latest version ${ logger.style.misc(latestVersion) }!`,
+                    `-> ${ logger.style.command(`npm i ${ isInstalledGlobally ? '-g ' : '' }${ name }@${ latestVersion }`) }`
+                ];
+            } else {
+                message = [
+                    `${ isInstalledGlobally ? 'Global module' : 'Module' } ${ logger.style.misc(name) } (${currentVersion}) is out-dated.`,
+                    `Please upgrade it to latest version ${ logger.style.misc(latestVersion) }.`,
+                    `You can do it by running the following command: ${ logger.style.command(`npm i ${ isInstalledGlobally ? '-g ' : '' }${ name }@${ latestVersion }`) }.`
+                ];
+            }
+
+            process.isOutOfDateVersion = true;
+            process.isOutOfDateVersionMessage = message;
+        }
+    } catch (e) {
+        logger.warn(`Package ${ logger.style.misc(name) } is not yet published.`);
+        logger.log(); // add empty line
+    }
+
+    const [containername, ...commands] = process.argv.slice(2);
+
+    return executeTask({
+        containername,
+        commands
+    });
+})();

package/index.js

@@ -13,7 +13,7 @@ if (isRunningRoot()) {
 We detected that you are running ${ logger.style.misc('magento-scripts') } as root user.
 We cannot allow you to run ${ logger.style.misc('magento-scripts') } with root privileges, this will only cause more problems.
 
-If you are experiencing problems with ${ logger.style.misc('Docker') }, ${ logger.style.misc('PHPBrew') } and ${ logger.style.misc('PHP') } compilation or ${ logger.style.misc('Magento') } setup, running ${ logger.style.misc('magento-scripts') } as root will not solve those problems.
+If you are experiencing problems with ${ logger.style.misc('Docker') } or ${ logger.style.misc('Magento') } setup, running ${ logger.style.misc('magento-scripts') } as root will not solve those problems.
 `);
 
     process.exit(1);

package/lib/commands/cli.js

@@ -5,9 +5,9 @@ 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 { installComposer, installPrestissimo } = require('../tasks/composer');
 const ConsoleBlock = require('../util/console-block');
-const checkComposerCredentials = require('../tasks/requirements/composer');
+const { checkComposerCredentials } = require('../tasks/requirements/composer-credentials');
 
 /**
  * @param {import('yargs')} yargs
@@ -18,8 +18,6 @@ module.exports = (yargs) => {
             getMagentoVersionConfig(),
             checkConfigurationFile(),
             getProjectConfiguration(),
-            installComposer(),
-            installPrestissimo(),
             createBashrcConfigFile(),
             checkComposerCredentials()
         ], {
@@ -63,8 +61,8 @@ module.exports = (yargs) => {
             .addEmptyLine();
 
         block
-            .addLine(`Connect to MySQL server: ${logger.style.command('mysql')}`)
-            .addLine(`Connect to MySQL server as root: ${logger.style.command('mysqlroot')}`)
+            .addLine(`Connect to MariaDB server: ${logger.style.command('mariadb')}`)
+            .addLine(`Connect to MariaDB server as root: ${logger.style.command('mariadbroot')}`)
             .addEmptyLine();
 
         block.log();

package/lib/commands/execute.js

@@ -1,6 +1,4 @@
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const { docker } = require('../config');
-const executeInContainer = require('../tasks/execute');
+const { executeTask } = require('../tasks/execute');
 
 /**
  * @param {import('yargs')} yargs
@@ -13,7 +11,7 @@ module.exports = (yargs) => {
             yargs.usage(`Usage: npm run exec <container name> [commands...]
 
 Available containers:
-- mysql
+- mariadb
 - nginx
 - redis
 - elasticsearch
@@ -21,35 +19,7 @@ Available containers:
 - sslTerminator`);
         },
         async (argv) => {
-            const containers = (await docker).getContainers();
-            const services = Object.keys(containers);
-
-            if (services.includes(argv.containername) || services.some((service) => service.includes(argv.containername))) {
-                const container = containers[argv.containername]
-                    ? containers[argv.containername]
-                    : Object.entries(containers).find(([key]) => key.includes(argv.containername))[1];
-
-                if (argv.commands.length === 0) {
-                // if we have default connect command then use it
-                    if (container.connectCommand) {
-                    // eslint-disable-next-line no-param-reassign
-                        argv.commands = container.connectCommand;
-                    } else {
-                    // otherwise fall back to bash (if it exists inside container)
-                        argv.commands.push('bash');
-                    }
-                }
-
-                logger.logN(`Executing container ${logger.style.misc(container._)}`);
-                await executeInContainer({
-                    containerName: container.name,
-                    commands: argv.commands
-                });
-
-                return;
-            }
-
-            logger.error(`No container found "${argv.containername}"`);
+            await executeTask(argv);
         }
     );
 };

package/lib/commands/import-db.js

@@ -8,7 +8,7 @@ const importDump = require('../tasks/import-dump');
 module.exports = (yargs) => {
     yargs.command(
         'import-db [importDb]',
-        'Import database dump to MySQL',
+        'Import database dump to MariaDB',
         (yargs) => {
             yargs.option('remote-db', {
                 alias: 'r',

package/lib/commands/logs.js

@@ -14,7 +14,7 @@ module.exports = (yargs) => {
 
 Available scopes:
 - magento
-- mysql
+- mariadb
 - redis
 - nginx
 - elasticsearch

package/lib/commands/start.js

@@ -17,6 +17,26 @@ const cmaGaTrackingId = 'UA-127741417-7';
 
 googleAnalytics.setGaTrackingId(cmaGaTrackingId);
 
+const reportErrors = async (errors) => {
+    for (const error of errors) {
+        const path = (error.path && ` Error path: ${error.path} `) || '';
+        if (error instanceof UnknownError || error instanceof KnownError) {
+            logger.error(error.message);
+            if (error instanceof UnknownError) {
+                await googleAnalytics.trackError(`Unknown Error:${path}${error.stack}`);
+            } else {
+                await googleAnalytics.trackError(`Known Error:${path}${error.message}`);
+            }
+        } else if (error instanceof Error) {
+            logger.error(error.message);
+            await googleAnalytics.trackError(`Regular Error:${path}${error.message}`);
+        } else {
+            logger.error(error);
+            await googleAnalytics.trackError(`Non Error:${path}${error}`); // track non-errors throws
+        }
+    }
+};
+
 /**
  * @param {import('yargs')} yargs
  */
@@ -49,10 +69,6 @@ module.exports = (yargs) => {
                 type: 'boolean',
                 default: false
             })
-            .option('import-db', {
-                describe: 'Import database dump to MySQL',
-                type: 'string'
-            })
             .option('edition', {
                 alias: 'e',
                 describe: 'Magento Edition to install',
@@ -80,7 +96,8 @@ module.exports = (yargs) => {
                     rendererOptions: {
                         showErrorMessage: false,
                         showTimer: true
-                    }
+                    },
+                    collectErrors: 'minimal'
                 }
             );
             const timeStamp = Date.now();
@@ -148,11 +165,18 @@ module.exports = (yargs) => {
                 block.log();
 
                 logger.note(
-                    `MySQL credentials, containers status and project information available in ${logger.style.code('npm run status')} command.
+                    `MariaDB credentials, containers status and project information available in ${logger.style.code('npm run status')} command.
       To access Magento CLI, Composer and PHP for this project use ${logger.style.code('npm run cli')} command.`
                 );
                 logger.log('');
 
+                if (!analytics && tasks.err && tasks.err.length > 0) {
+                    logger.warn('You have disabled analytics, but we\'ve encountered errors during startup!');
+                    for (const err of tasks.err) {
+                        logger.error(`${err.path}\n${err.message}\n\n${err.stack}`);
+                    }
+                }
+
                 if (!analytics) {
                     process.exit(0);
                 }
@@ -178,22 +202,16 @@ module.exports = (yargs) => {
                     await googleAnalytics.trackError(e.message || e);
                 }
 
-                process.exit(0);
-            } catch (e) {
-                if (e instanceof UnknownError || e instanceof KnownError) {
-                    logger.error(e.message);
-                    if (e instanceof UnknownError) {
-                        await googleAnalytics.trackError(`Unknown Error: ${e.stack}`);
-                    } else {
-                        await googleAnalytics.trackError(`Known Error: ${e.message}`);
+                if (tasks.err && tasks.err.length > 0) {
+                    for (const err of tasks.err) {
+                        console.log(err);
                     }
-                } else if (e instanceof Error) {
-                    logger.error(e.message);
-                    await googleAnalytics.trackError(`Regular Error: ${e.message}`);
-                } else {
-                    logger.error(e);
-                    await googleAnalytics.trackError(`Non Error: ${e}`); // track non-errors throws
+                    await reportErrors(tasks.err);
                 }
+
+                process.exit(0);
+            } catch (e) {
+                await reportErrors([e]);
                 process.exit(1);
             }
         }

package/lib/commands/status.js

@@ -8,6 +8,7 @@ const { checkRequirements } = require('../tasks/requirements');
 const { statusContainers } = require('../tasks/docker/containers');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
+const checkPHPVersion = require('../tasks/requirements/php-version');
 
 /**
  * @param {import('yargs')} yargs
@@ -20,6 +21,7 @@ module.exports = (yargs) => {
             checkConfigurationFile(),
             getProjectConfiguration(),
             getCachedPorts(),
+            checkPHPVersion(),
             statusContainers()
         ], {
             concurrent: false,

package/lib/config/docker.js

@@ -1,48 +1,60 @@
 const os = require('os');
 const path = require('path');
-const { getArch } = require('../util/arch');
-const getIsWsl = require('../util/is-wsl');
+const getPhpConfig = require('./php-config');
 const { isIpAddress } = require('../util/ip');
 
 const systeminformation = require('systeminformation');
+const { deepmerge } = require('../util/deepmerge');
+const defaultEsEnv = require('./services/elasticsearch/default-es-env');
 
-module.exports = async ({ configuration, ssl, host }, config) => {
+/**
+ *
+ * @param {import('../../typings/context').ListrContext} ctx
+ * @param {import('../../typings/context').ListrContext['config']['overridenConfiguration']} overridenConfiguration
+ * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
+ * @returns
+ */
+module.exports = async (ctx, overridenConfiguration, baseConfig) => {
+    const { configuration, ssl, host } = overridenConfiguration;
     const {
         nginx,
         redis,
-        mysql,
         elasticsearch,
         mariadb,
         varnish
     } = configuration;
 
+    const php = getPhpConfig(configuration, baseConfig);
     const {
         prefix,
         magentoDir,
+        containerMagentoDir,
         cacheDir
-    } = config;
+    } = baseConfig;
 
-    const cpuSupportedFlags = await systeminformation.cpuFlags();
+    const cpuSupportedFlags = (await systeminformation.cpuFlags()).split(' ');
 
     const network = {
         name: `${ prefix }_network`
     };
 
     const volumes = {
-        mysql: {
-            name: `${ prefix }_mysql-data`
+        mariadb: {
+            name: `${ prefix }_mariadb-data`
         },
         redis: {
             name: `${ prefix }_redis-data`
         },
         elasticsearch: {
             name: `${ prefix }_elasticsearch-data`
+        },
+        composer_home: {
+            name: 'composer_home-data'
         }
     };
 
-    const isLinux = os.platform() === 'linux';
-    const isWsl = await getIsWsl();
-    const isArm = (await getArch()) === 'arm64';
+    const isLinux = ctx.platform === 'linux';
+    const { isWsl } = ctx;
     const isNotNativeLinux = (!isLinux || isWsl);
 
     if (!isLinux) {
@@ -50,9 +62,17 @@ module.exports = async ({ configuration, ssl, host }, config) => {
          * When CMA is running in non-native linux environment,
          * we need also create named volumes for nginx to avoid performance penalty
          */
+        volumes.php = {
+            name: `${ prefix }_project-data`,
+            opt: {
+                type: 'nfs',
+                device: path.join(magentoDir),
+                o: 'bind'
+            }
+        };
         volumes.nginx = {
             name: `${ prefix }_nginx-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
@@ -60,7 +80,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
         };
         volumes.appPub = {
             name: `${ prefix }_pub-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(magentoDir, 'pub'),
                 o: 'bind'
@@ -68,7 +88,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
         };
         volumes.appSetup = {
             name: `${ prefix }_setup-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(magentoDir, 'setup'),
                 o: 'bind'
@@ -76,7 +96,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
         };
         volumes.sslTerminator = {
             name: `${ prefix }_ssl-terminator-data`,
-            opts: {
+            opt: {
                 type: 'nfs',
                 device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
@@ -86,7 +106,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
         if (varnish.enabled) {
             volumes.varnish = {
                 name: `${ prefix }_varnish-data`,
-                opts: {
+                opt: {
                     type: 'nfs',
                     device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
@@ -96,7 +116,42 @@ module.exports = async ({ configuration, ssl, host }, config) => {
     }
 
     const getContainers = (ports = {}) => {
+        /**
+         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions>}
+         */
         const dockerConfig = {
+            php: {
+                _: 'PHP',
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.fpm }:9000`
+                ] : [],
+                forwardedPorts: [
+                    isNotNativeLinux
+                        ? `127.0.0.1:${ ports.fpm }:9000`
+                        : `127.0.0.1:${ ports.fpm }`
+                ],
+                network: isNotNativeLinux ? network.name : 'host',
+                mountVolumes: [
+                    `${ isLinux ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
+                    `${ volumes.composer_home.name }:/composer/home`,
+                    `${ php.iniPath }:/usr/local/etc/php/php.ini`,
+                    `${ php.fpmConfPath }:/usr/local/etc/php-fpm.d/zz-docker.conf`
+                ],
+                env: {
+                    COMPOSER_AUTH: JSON.stringify(JSON.parse(process.env.COMPOSER_AUTH), null, 0) || '',
+                    COMPOSER_HOME: '/composer/home'
+                },
+                restart: 'on-failure:5',
+                image: `local-cma-project:${ prefix }`,
+                debugImage: `local-cma-project:${ prefix }.debug`,
+                remoteImages: [
+                    configuration.php.baseImage,
+                    configuration.php.debugImage
+                ],
+                name: `${ prefix }_php`,
+                connectCommand: ['/bin/sh'],
+                user: isLinux ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
+            },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
                 ports: isNotNativeLinux ? [
@@ -117,13 +172,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     `${ isLinux ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
                 ],
                 restart: 'on-failure:5',
-                // TODO: use connect instead
                 network: isNotNativeLinux ? network.name : 'host',
-                image: `nginx:${ nginx.version }`,
-                imageDetails: {
-                    name: 'nginx',
-                    tag: nginx.version
-                },
+                image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_ssl-terminator`,
                 command: "nginx -g 'daemon off;'"
             },
@@ -145,21 +195,17 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                  */
                 mountVolumes: isLinux ? [
                     `${ cacheDir }/nginx/conf.d:/etc/nginx/conf.d`,
-                    `${ path.join(magentoDir, 'pub') }:${path.join(magentoDir, 'pub')}`,
-                    `${ path.join(magentoDir, 'setup') }:${path.join(magentoDir, 'setup')}`
+                    `${ path.join(magentoDir, 'pub') }:${path.join(containerMagentoDir, 'pub')}`,
+                    `${ path.join(magentoDir, 'setup') }:${path.join(containerMagentoDir, 'setup')}`
                 ] : [
                     `${ volumes.nginx.name }:/etc/nginx/conf.d`,
-                    `${ volumes.appPub.name }:${path.join(magentoDir, 'pub')}`,
-                    `${ volumes.appSetup.name }:${path.join(magentoDir, 'setup')}`
+                    `${ volumes.appPub.name }:${path.join(containerMagentoDir, 'pub')}`,
+                    `${ volumes.appSetup.name }:${path.join(containerMagentoDir, 'setup')}`
                 ],
                 restart: 'on-failure:5',
                 // TODO: use connect instead
                 network: isNotNativeLinux ? network.name : 'host',
-                image: `nginx:${ nginx.version }`,
-                imageDetails: {
-                    name: 'nginx',
-                    tag: nginx.version
-                },
+                image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_nginx`,
                 command: "nginx -g 'daemon off;'"
             },
@@ -173,56 +219,38 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 mounts: [`source=${ volumes.redis.name },target=/data`],
                 // TODO: use connect instead
                 network: network.name,
-                image: `redis:${ redis.version }`,
-                imageDetails: {
-                    name: 'redis',
-                    tag: redis.version
-                },
+                image: `${ redis.version ? `redis:${ redis.version }` : redis.image }`,
                 name: `${ prefix }_redis`,
                 connectCommand: ['redis-cli']
             },
-            mysql: {
-                _: !isArm ? 'MySQL' : 'MariaDB',
+            mariadb: {
+                _: 'MariaDB',
                 healthCheck: {
                     cmd: 'mysqladmin ping --silent'
                 },
-                ports: [`127.0.0.1:${ ports.mysql }:3306`],
-                forwardedPorts: [`127.0.0.1:${ ports.mysql }:3306`],
-                mounts: [`source=${ volumes.mysql.name },target=/var/lib/mysql`],
+                ports: [`127.0.0.1:${ ports.mariadb }:3306`],
+                forwardedPorts: [`127.0.0.1:${ ports.mariadb }:3306`],
+                mountVolumes: [
+                    `${ volumes.mariadb.name }:/var/lib/mysql`,
+                    `${ path.join(baseConfig.cacheDir, 'mariadb.cnf') }:/etc/mysql/my.cnf`
+                ],
                 env: {
-                    MYSQL_PORT: 3306,
-                    MYSQL_ROOT_PASSWORD: 'scandipwa',
-                    MYSQL_USER: 'magento',
-                    MYSQL_PASSWORD: 'magento',
-                    MYSQL_DATABASE: 'magento'
+                    MARIADB_PORT: 3306,
+                    MARIADB_ROOT_PASSWORD: 'scandipwa',
+                    MARIADB_USER: 'magento',
+                    MARIADB_PASSWORD: 'magento',
+                    MARIADB_DATABASE: 'magento'
                 },
-                /**
-                 * When database dump contains functions, MySQL can throw and error "access denied for those functions"
-                 * so to overcome this issue, we need to enable trust option for these functions to avoid errors during migrations.
-                 *
-                 * Documentation reference: https://dev.mysql.com/doc/refman/5.7/en/stored-programs-logging.html
-                 */
                 command: [
-                    '--log_bin_trust_function_creators=1',
-                    '--default-authentication-plugin=mysql_native_password',
-                    '--max_allowed_packet=1GB',
-                    '--bind-address=0.0.0.0'
+                    '--log_bin_trust_function_creators=1'
                 ]
-                    .concat(!isArm ? ['--secure-file-priv=NULL'] : [])
                     .join(' '),
                 securityOptions: [
                     'seccomp=unconfined'
                 ],
                 network: network.name,
-                image: !isArm ? `mysql:${ mysql.version }` : `mariadb:${ mariadb.version }`,
-                imageDetails: !isArm ? {
-                    name: 'mysql',
-                    tag: mysql.version
-                } : {
-                    name: 'mariadb',
-                    tag: mariadb.version
-                },
-                name: !isArm ? `${ prefix }_mysql` : `${ prefix }_mariadb`
+                image: `${ mariadb.version ? `mariadb:${ mariadb.version }` : mariadb.image }`,
+                name: `${ prefix }_mariadb`
             },
             elasticsearch: {
                 _: 'ElasticSearch',
@@ -232,38 +260,28 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ports: [`127.0.0.1:${ ports.elasticsearch }:9200`],
                 forwardedPorts: [`127.0.0.1:${ ports.elasticsearch }:9200`],
                 mounts: [`source=${ volumes.elasticsearch.name },target=/usr/share/elasticsearch/data`],
-                env: {
-                    'bootstrap.memory_lock': true,
-                    'xpack.security.enabled': false,
-                    'discovery.type': 'single-node',
-                    ES_JAVA_OPTS: '"-Xms512m -Xmx512m"',
+                env: deepmerge(
+                    {
                     // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
-                    'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
-                },
+                        'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
+                    }, elasticsearch.env || defaultEsEnv
+                ),
                 network: network.name,
-                image: `elasticsearch:${ elasticsearch.version }`,
-                imageDetails: {
-                    name: 'elasticsearch',
-                    tag: elasticsearch.version
-                },
+                image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
                 name: `${ prefix }_elasticsearch`
             }
         };
 
         if (ssl.enabled) {
-            dockerConfig.nginx.ports.push(
+            dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             );
         }
 
-        if (varnish.enabled) {
+        if (!ctx.debug && varnish.enabled) {
             dockerConfig.varnish = {
                 _: 'Varnish',
-                image: `varnish:${ varnish.version }`,
-                imageDetails: {
-                    name: 'varnish',
-                    tag: varnish.version
-                },
+                image: `${ varnish.version ? `varnish:${ varnish.version }` : varnish.image }`,
                 name: `${ prefix }_varnish`,
                 mountVolumes: [
                     `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`

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

@@ -8,7 +8,9 @@ const getProjectConfiguration = () => ({
     task: async (ctx) => {
         const { magentoVersion } = ctx;
 
-        ctx.config = await getConfigFromMagentoVersion(magentoVersion, process.cwd());
+        ctx.config = await getConfigFromMagentoVersion(ctx, {
+            magentoVersion
+        });
     }
 });