@scandipwa/magento-scripts 2.0.0-alpha.0 → 2.0.0-alpha.11

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

@@ -7,8 +7,10 @@ const { runContainerImage } = require('../../util/run-container-image');
 const checkPHPVersion = () => ({
     title: 'Checking container PHP version',
     task: async (ctx, task) => {
-        const { php } = ctx.config.docker.getContainers(ctx.ports);
-        const phpVersionResponse = await runContainerImage(php.image, 'php --version');
+        const phpVersionResponse = await runContainerImage(
+            ctx.config.overridenConfiguration.configuration.php.baseImage,
+            'php --version'
+        );
 
         const phpVersionResponseResult = phpVersionResponse.match(/PHP\s(\d+\.\d+\.\d+)/i);
 

package/lib/tasks/start.js

@@ -12,13 +12,7 @@ const { installMagentoProject, setupMagento } = require('./magento');
 const { pullImages, stopContainers } = require('./docker/containers');
 const dockerNetwork = require('./docker/network');
 const { setPrefix } = require('./prefix');
-const {
-    connectToMySQL
-    // importDumpToMySQL,
-    // fixDB,
-    // restoreThemeConfig,
-    // dumpThemeConfig
-} = require('./mysql');
+const { connectToDatabase } = require('./database');
 const { buildProjectImage, buildDebugProjectImage } = require('./docker/project-image-builder');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const { getSystemConfigTask } = require('../config/system-config');
@@ -32,7 +26,19 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
 const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
 const checkPHPVersion = require('./requirements/php-version');
-const volumes = require('./docker/volumes');
+const volumes = require('./docker/volume/tasks');
+const convertMySQLDatabaseToMariaDB = require('./docker/convert-mysql-to-mariadb');
+const { cmaGlobalConfig } = require('../config/cma-config');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ */
+const resetCmaGlobalConfig = () => ({
+    skip: (ctx) => !ctx.resetGlobalConfig,
+    task: () => {
+        cmaGlobalConfig.clear();
+    }
+});
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -63,7 +69,8 @@ const retrieveProjectConfiguration = () => ({
 const stopProject = () => ({
     title: 'Stopping project',
     task: (ctx, task) => task.newListr([
-        stopContainers()
+        stopContainers(),
+        volumes.removeLocalVolumes()
     ]),
     options: {
         showTimer: false
@@ -97,9 +104,20 @@ const retrieveFreshProjectConfiguration = () => ({
 const configureProject = () => ({
     title: 'Configuring project',
     task: (ctx, task) => task.newListr([
-        pullImages(),
-        dockerNetwork.tasks.createNetwork(),
-        volumes.createVolumes(),
+        convertMySQLDatabaseToMariaDB(),
+        {
+            task: (ctx, task) => task.newListr([
+                pullImages(),
+                dockerNetwork.tasks.createNetwork(),
+                volumes.createVolumes()
+            ], { concurrent: true })
+        },
+        {
+            task: (ctx, task) => task.newListr([
+                checkPHPVersion(),
+                getComposerVersionTask()
+            ], { concurrent: true })
+        },
         {
             task: (ctx, task) => task.newListr([
                 buildProjectImage(),
@@ -108,13 +126,11 @@ const configureProject = () => ({
                 concurrent: true
             })
         },
-        checkPHPVersion(),
-        getComposerVersionTask(),
         prepareFileSystem(),
         installMagentoProject(),
         enableMagentoComposerPlugins(),
         startServices(),
-        connectToMySQL()
+        connectToDatabase()
     ])
 });
 
@@ -125,22 +141,6 @@ const finishProjectConfiguration = () => ({
     title: 'Finishing project configuration',
     skip: ({ skipSetup }) => skipSetup,
     task: (ctx, task) => task.newListr([
-        // {
-        //     skip: (ctx) => !ctx.importDb,
-        //     task: (ctx, task) => {
-        //         task.title = 'Importing database dump';
-        //         return task.newListr([
-        //             dumpThemeConfig(),
-        //             importDumpToMySQL(),
-        //             fixDB(),
-        //             restoreThemeConfig(),
-        //             setupMagento()
-        //         ], {
-        //             concurrent: false,
-        //             exitOnError: true
-        //         });
-        //     }
-        // },
         setupThemes(),
         waitingForVarnish()
     ], {
@@ -158,6 +158,7 @@ const start = () => ({
     task: (ctx, task) => {
         task.title = `Starting project (magento-scripts@${pkg.version})`;
         return task.newListr([
+            resetCmaGlobalConfig(),
             checkRequirements(),
             retrieveProjectConfiguration(),
             stopProject(),

package/lib/tasks/status/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 const path = require('path');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { getProjectCreatedAt, getPrefix } = require('../../util/prefix');
@@ -5,7 +6,6 @@ const { getProjectCreatedAt, getPrefix } = require('../../util/prefix');
 const { version: packageVersion } = require('../../../package.json');
 const { getArchSync } = require('../../util/arch');
 const ConsoleBlock = require('../../util/console-block');
-const { getComposerVersion } = require('../composer');
 const { getInstanceMetadata } = require('../../util/instance-metadata');
 
 /**
@@ -22,6 +22,9 @@ const parsePort = (port) => {
     };
 };
 
+/**
+ * @param {import('../../../typings/context').ListrContext & { containers: ReturnType<Awaited<ReturnType<import('../../config/docker')>>['getContainers']> }} ctx
+ */
 const prettyStatus = async (ctx) => {
     const {
         config: {
@@ -31,10 +34,10 @@ const prettyStatus = async (ctx) => {
         dockerVersion,
         platform,
         platformVersion,
-        containers
+        containers,
+        composerVersion
     } = ctx;
     const projectCreatedAt = getProjectCreatedAt();
-    const composerVersion = await getComposerVersion(ctx);
 
     const prefix = getPrefix();
 
@@ -73,8 +76,10 @@ const prettyStatus = async (ctx) => {
 
         if (container.status && container.status.Health) {
             containerStatus = `✓ ${ logger.style.file(container.status.Health.Status) } and ${ logger.style.file('running') }`;
-        } else {
+        } else if (container.status) {
             containerStatus = logger.style.file(container.status.Status);
+        } else {
+            containerStatus = '✖ Not running';
         }
 
         block
@@ -83,7 +88,7 @@ const prettyStatus = async (ctx) => {
             .addLine(`Image: ${logger.style.file(container.image)}`)
             .addLine(`Network: ${logger.style.link(container.network)}`);
 
-        if (container.forwardedPorts && container.forwardedPorts.length > 0) {
+        if (!containerStatus.includes('Not running') && container.forwardedPorts && container.forwardedPorts.length > 0) {
             block.addLine('Port forwarding:');
             container.forwardedPorts.forEach((port) => {
                 const { host, hostPort, containerPort } = parsePort(port);
@@ -101,6 +106,13 @@ const prettyStatus = async (ctx) => {
                 block.addLine(`${' '.repeat(3)} ${logger.style.misc(envName)}=${logger.style.file(envValue)}`);
             }
         }
+
+        if (container.description) {
+            block.addLine('Description:');
+            container.description.split('\n').forEach((line) => {
+                block.addLine(line);
+            });
+        }
     });
 
     const instanceMetadata = getInstanceMetadata(ctx);
@@ -121,14 +133,6 @@ const prettyStatus = async (ctx) => {
     instanceMetadata.admin.forEach(({ title, text }) => {
         block.addLine(`  ${title}: ${text}`);
     });
-    // block
-    //     .addEmptyLine()
-    //     .addSeparator('Magento status')
-    //     .addEmptyLine()
-    //     .addLine(`Web location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/`)}`)
-    //     .addLine(`Magento Admin panel location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/${magentoConfiguration.adminuri}`)}`)
-    //     .addLine(`Magento Admin panel credentials: ${logger.style.misc(magentoConfiguration.user)} - ${logger.style.misc(magentoConfiguration.password)}`)
-    //     .addEmptyLine();
 
     block.log();
 };

package/lib/tasks/stop.js

@@ -2,6 +2,7 @@ const { stopServices } = require('./docker');
 const getMagentoVersionConfig = require('../config/get-magento-version-config');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
+const getDockerVersion = require('./requirements/docker/version');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -9,6 +10,7 @@ const checkConfigurationFile = require('../config/check-configuration-file');
 const stop = () => ({
     title: 'Stopping project',
     task: async (ctx, task) => task.newListr([
+        getDockerVersion(),
         getMagentoVersionConfig(),
         checkConfigurationFile(),
         getProjectConfiguration(),

package/lib/tasks/theme/link-theme.js

@@ -18,7 +18,7 @@ const linkTheme = () => ({
             absoluteThemePath,
             themePath,
             composerData,
-            mysqlConnection
+            databaseConnection
         } = ctx;
         const {
             magento: { edition: magentoEdition },
@@ -27,7 +27,7 @@ const linkTheme = () => ({
 
         const isEnterprise = magentoEdition === 'enterprise';
         const isPageBuilderInstalled = isEnterprise && semver.satisfies(semver.coerce(magentoVersion), '^2.4');
-        const [queryResult] = await mysqlConnection.query(`
+        const [queryResult] = await databaseConnection.query(`
                 SELECT value AS isPagebuilderEnabled
                 FROM core_config_data
                 WHERE path = 'cms/pagebuilder/enabled'

package/lib/util/config-file-validator.js

@@ -46,10 +46,16 @@ const sslSchema = Joi.object({
     ssl_certificate_key: Joi.string().required()
 });
 
+/**
+ * @type {Joi.ObjectSchema<import('../../typings/index').PHPExtensions>}
+ */
 const phpExtensionConfiguration = Joi.object()
     .pattern(
         Joi.string(),
         Joi.object({
+            alternativeName: Joi.array().items(Joi.string()).optional(),
+            command: Joi.func().optional(),
+            dependencies: Joi.array().items(Joi.string()).optional(),
             version: Joi.string().optional()
         })
             .unknown()
@@ -59,38 +65,49 @@ const phpExtensionConfiguration = Joi.object()
  * @type {Joi.ObjectSchema<import('../../typings').PHPConfiguration>}
  */
 const phpConfigurationSchema = Joi.object({
-    version: Joi.string().optional().custom(versionValidator),
+    baseImage: Joi.string().optional(),
+    debugImage: Joi.string().optional(),
+    fpmConfigTemplate: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator),
-    extensions: phpExtensionConfiguration.optional(),
-    disabledExtensions: Joi.array().items(Joi.string())
+    debugTemplate: Joi.string().optional().custom(fileExistsValidator),
+    extensions: phpExtensionConfiguration.optional()
 });
 
 /**
  * @type {Joi.ObjectSchema<import('../../typings').NginxConfiguration>}
  */
 const nginxConfigurationSchema = Joi.object({
-    version: Joi.string().optional(),
+    image: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator)
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').NginxConfiguration>}
+ * @type {Joi.ObjectSchema<import('../../typings').VarnishConfiguration>}
  */
 const varnishConfigurationSchema = Joi.object({
     enabled: Joi.boolean().optional(),
-    version: Joi.string().optional(),
+    healthCheck: Joi.boolean().optional(),
+    image: Joi.string().optional(),
     configTemplate: Joi.string().optional().custom(fileExistsValidator)
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').ServiceWithVersion>}
+ * @type {Joi.ObjectSchema<import('../../typings').ServiceWithImage>}
  */
 const serviceConfigurationSchema = Joi.object({
-    version: Joi.string().optional()
+    image: Joi.string().optional()
+});
+
+/**
+ * @type {Joi.ObjectSchema<import('../../typings').ElasticSearchConfiguration>}
+ */
+const elasticsearchConfigurationSchema = Joi.object({
+    image: Joi.string().optional(),
+    env: Joi.object().optional()
 });
 
 /**
- * @type {Joi.ObjectSchema<import('../../typings').CMAConfiguration['configuration']['composer']>}
+ * @type {Joi.ObjectSchema<import('../../typings').ComposerConfiguration>}
  */
 const composerConfigurationSchema = Joi.object({
     version: Joi.string().optional().custom((value) => {
@@ -108,8 +125,8 @@ const composerConfigurationSchema = Joi.object({
 const configurationSchema = Joi.object({
     php: phpConfigurationSchema.optional(),
     nginx: nginxConfigurationSchema.optional(),
-    mysql: serviceConfigurationSchema.optional(),
-    elasticsearch: serviceConfigurationSchema.optional(),
+    mariadb: serviceConfigurationSchema.optional(),
+    elasticsearch: elasticsearchConfigurationSchema.optional(),
     redis: serviceConfigurationSchema.optional(),
     composer: composerConfigurationSchema.optional(),
     varnish: varnishConfigurationSchema.optional(),
@@ -124,8 +141,7 @@ const configFileSchema = Joi.object({
     host: Joi.string().optional(),
     ssl: sslSchema.optional(),
     prefix: Joi.bool().optional(),
-    configuration: configurationSchema.required(),
-    useNonOverlappingPorts: Joi.bool().forbidden()
+    configuration: configurationSchema.required()
 });
 
 /**

package/lib/util/database.js

@@ -4,8 +4,8 @@
  * @param {{path: string, value: string}[]} values
  * @param {import('../../typings/context').ListrContext} param1
  */
-const updateTableValues = async (table, values, { mysqlConnection, task }) => {
-    const [rows] = await mysqlConnection.query(`
+const updateTableValues = async (table, values, { databaseConnection, task }) => {
+    const [rows] = await databaseConnection.query(`
         SELECT * FROM ${table}
         WHERE ${values.map((p) => `path = '${p.path}'`).join(' OR ')};
     `);
@@ -13,7 +13,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     if (rows.filter(Boolean).length !== values.length) {
         const lostConfigs = values.filter((p) => !rows.some((row) => row.path === p.path));
         for (const config of lostConfigs) {
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 INSERT INTO ${table}
                 (scope, path, value)
                 VALUES ('default', ?, ?);
@@ -22,7 +22,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
 
         const configsToUpdate = values.filter((p) => rows.some((row) => row.path === p.path));
         for (const config of configsToUpdate) {
-            await mysqlConnection.query(`
+            await databaseConnection.query(`
                 UPDATE ${table}
                 SET value = ?
                 WHERE path = ?;
@@ -50,7 +50,7 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     });
 
     for (const config of configsToUpdate) {
-        await mysqlConnection.query(`
+        await databaseConnection.query(`
             UPDATE ${table}
             SET value = ?
             WHERE path = ?;
@@ -63,11 +63,11 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
 * @param {String} tableName
 * @param {import('../../typings/context').ListrContext} param2
 */
-const isTableExists = async (database, tableName, { mysqlConnection }) => {
+const isTableExists = async (database, tableName, { databaseConnection }) => {
     /**
     * @type {{ tableCount: number }[][]}
     */
-    const [[{ tableCount }]] = await mysqlConnection.query(`
+    const [[{ tableCount }]] = await databaseConnection.query(`
    SELECT count(*) as tableCount
    FROM information_schema.TABLES
    WHERE (TABLE_SCHEMA = ?) AND (TABLE_NAME = ?);

package/lib/util/execute-in-container.js

@@ -0,0 +1,63 @@
+const os = require('os');
+const { spawn } = require('child_process');
+const { runCommand } = require('../tasks/docker/containers/container-api');
+
+/**
+ * @param {{ containerName: string, commands: string[], isDockerDesktop: boolean }} param0
+ */
+const executeInContainer = ({ containerName, commands, isDockerDesktop }) => {
+    if (!process.stdin.isTTY) {
+        process.stderr.write('This app works only in TTY mode');
+        process.exit(1);
+    }
+
+    const userArg = ((os.platform() === 'linux' && isDockerDesktop) || !isDockerDesktop) && `--user=${os.userInfo().uid}:${os.userInfo().gid}`;
+
+    spawn('docker', [
+        'exec',
+        '-it',
+        userArg,
+        containerName
+    ]
+        .filter(Boolean)
+        .concat(...commands.map((command) => command.split(' ')).flat()),
+    {
+        stdio: [0, 1, 2]
+    });
+
+    return new Promise((_resolve) => {
+        // never resolve
+    });
+};
+
+/**
+ * @param {import('../tasks/docker/containers/container-api').ContainerRunOptions} options
+ * @param {string[]} commands
+ */
+const runInContainer = (options, commands) => {
+    if (!process.stdin.isTTY) {
+        process.stderr.write('This app works only in TTY mode');
+        process.exit(1);
+    }
+
+    const runArgs = runCommand({
+        ...options,
+        tty: true,
+        detach: false,
+        rm: true,
+        command: commands.map((command) => command.split(' ')).flat().join(' ')
+    });
+
+    const args = runArgs.slice(1).map((command) => command.split(' ')).flat();
+
+    spawn('docker', args, { stdio: [0, 1, 2] });
+
+    return new Promise((_resolve) => {
+        // never resolve
+    });
+};
+
+module.exports = {
+    executeInContainer,
+    runInContainer
+};

package/lib/util/prefix.js

@@ -22,7 +22,7 @@ const getPrefix = (fName = folderName) => {
     }
 
     if (projectInGlobalConfig && projectInGlobalConfig.prefix) {
-        return `${fName}.${projectInGlobalConfig.prefix}`;
+        return `${fName}-${projectInGlobalConfig.prefix}`;
     }
 
     return fName;

package/lib/util/systemctl.js

@@ -3,10 +3,10 @@ const { execAsyncSpawn } = require('./exec-async-command');
 /**
  * @param {String} cmd
  * @param {String} serviceName
- * @param {{ now: boolean }} options
+ * @param {{ now: boolean, user: boolean }} options
  */
 const run = (cmd, serviceName, options = {}) => execAsyncSpawn(
-    `systemctl ${ cmd }${ serviceName ? ` ${ serviceName }` : '' }${ options.now ? ' --now' : ''}`,
+    `systemctl ${ options.user ? '--user ' : '' }${ cmd }${ serviceName ? ` ${ serviceName }` : '' }${ options.now ? ' --now' : ''}`,
     {
         withCode: true
     }
@@ -14,29 +14,78 @@ const run = (cmd, serviceName, options = {}) => execAsyncSpawn(
 
 const daemonReload = () => run('daemon-reload');
 
-const systemctlControl = (serviceName) => ({
-    disable: () => run('disable', serviceName),
-    enable: () => run('enable', serviceName),
-    enableAndStart: () => run('enable', serviceName, { now: true }),
-    restart: () => run('restart', serviceName),
-    start: () => run('start', serviceName),
-    stop: () => run('stop', serviceName),
-    isEnabled: async () => {
+/**
+ * @param {String} serviceName
+ * @param {{ now: boolean, user: boolean }} defaultOptions
+ */
+const systemctlControl = (serviceName, defaultOptions = {}) => ({
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    disable: (options = {}) => run('disable', serviceName, { ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    enable: (options = {}) => run('enable', serviceName, { ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    enableAndStart: (options = {}) => run('enable', serviceName, { now: true, ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    restart: (options = {}) => run('restart', serviceName, { ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    start: (options = {}) => run('start', serviceName, { ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    stop: (options = {}) => run('stop', serviceName, { ...defaultOptions, ...options }),
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    isEnabled: async (options = {}) => {
         try {
-            const { result } = await run('is-enabled', serviceName);
+            const { result } = await run('is-enabled', serviceName, { ...defaultOptions, ...options });
             return result.includes('enabled');
         } catch (e) {
             return false;
         }
     },
-    isRunning: async () => {
+    /**
+     * @param {{ now: boolean, user: boolean }} options
+     */
+    isRunning: async (options = {}) => {
         try {
-            const { result } = await run('status', serviceName);
+            const { result } = await run('status', serviceName, { ...defaultOptions, ...options });
 
             return result.includes('active (running)');
         } catch (e) {
             return false;
         }
+    },
+    /**
+     * @param {{ user: boolean }} options
+     */
+    exists: async (options = {}) => {
+        const optionsToUse = { ...defaultOptions, ...options };
+        try {
+            // eslint-disable-next-line max-len, no-useless-escape
+            const command = `if [[ $(systemctl ${ optionsToUse.user ? '--user ' : ''}list-units --all -t service --full --no-legend "${ serviceName }.service" | sed 's/^\\s*//g' | cut -f1 -d' ') == ${ serviceName }.service ]]; then
+                echo "1"
+            else
+                echo "0"
+            fi`;
+            const result = await execAsyncSpawn(
+                command
+            );
+
+            return result === '1';
+        } catch (e) {
+            return false;
+        }
     }
 });
 

package/package.json

@@ -3,12 +3,13 @@
     "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.0",
+    "version": "2.0.0-alpha.11",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
     "bin": {
-        "magento-scripts": "./index.js"
+        "magento-scripts": "./index.js",
+        "magento-scripts-exec": "./exec.js"
     },
     "engines": {
         "node": ">=12"
@@ -53,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "a63454a3015891e4ebe5a7e84a0c88989a1d0edc"
+    "gitHead": "b66794d8d364bb6f5a56a826e74a30c3914c17f9"
 }

package/typings/context.d.ts

@@ -1,17 +1,19 @@
 import mysql2 from 'mysql2';
 
+import { DockerVersionResult } from '../lib/tasks/docker/api';
 import { CMAConfiguration, PHPExtensions } from './index';
 import { PHPStormConfig } from './phpstorm';
 
 export interface ListrContext {
     magentoVersion: string
     composerVersion: string
+    phpVersion: string
     port?: number
     ports?: {
         app: number
         fpm: number
         xdebug: number
-        mysql: number
+        mariadb: number
         redis: number
         elasticsearch: number
         varnish: number
@@ -45,15 +47,15 @@ export interface ListrContext {
             network: {
                 name: string
             }
-            volumes: Record<'mysql' | 'redis' | 'elasticsearch' | 'nginx' | 'appPub' | 'appSetup', {
+            volumes: Record<'mariadb' | 'redis' | 'elasticsearch' | 'nginx' | 'appPub' | 'appSetup', {
                 name: string
-                opts?: {
+                opt?: {
                     type: string
                     device: string
                     o: string
                 }
             }>
-            getContainers(): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
+            getContainers(): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mariadb' | 'elasticsearch' | 'varnish', {
                 _: string
                 ports: string[]
                 healthCheck: {
@@ -67,6 +69,7 @@ export interface ListrContext {
                 network: string
                 image: string
                 debugImage?: string
+                remoteImages?: string[]
                 name: string
                 command: string
                 connectCommand: string[]
@@ -88,6 +91,10 @@ export interface ListrContext {
         analytics: boolean
         useNonOverlappingPorts: boolean
     }
-    mysqlConnection: mysql2.Connection
+    databaseConnection: mysql2.Connection
     isSetupUpgradeNeeded?: boolean
+    isDockerDesktop?: boolean
+    dockerServerData?: DockerVersionResult['Server']
+    dockerClientData?: DockerVersionResult['Client']
+    dockerVersion?: DockerVersionResult['Server']['Version']
 }