@scandipwa/magento-scripts 2.0.0-alpha.2 → 2.0.0-alpha.20

package/lib/tasks/magento/setup-magento/index.js

@@ -12,6 +12,7 @@ const magentoTask = require('../../../util/magento-task');
 const urnHighlighter = require('./urn-highlighter');
 const adjustFullPageCache = require('./adjust-full-page-cache');
 const updateEnvPHP = require('../../php/update-env-php');
+const setMailConfig = require('./set-mail-config');
 
 /**
  * @param {Object} [options]
@@ -40,6 +41,7 @@ const setupMagento = (options = {}) => ({
                 task: (ctx, task) => task.newListr([
                     setBaseUrl(),
                     setUrlRewrite(),
+                    setMailConfig(),
                     increaseAdminSessionLifetime()
                 ], {
                     concurrent: true

package/lib/tasks/magento/setup-magento/install-magento.js

@@ -5,6 +5,8 @@ const UnknownError = require('../../../errors/unknown-error');
 const runMagentoCommand = require('../../../util/run-magento');
 const envPhpToJson = require('../../../util/env-php-json');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const { defaultMagentoDatabase } = require('../../database/default-magento-database');
+const defaultMagentoUser = require('../../database/default-magento-user');
 
 /**
  * @param {Object} [param0]
@@ -20,16 +22,14 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
         const {
             magentoVersion,
             config: {
-                docker,
                 magentoConfiguration
             },
             ports,
-            databaseConnection
+            databaseConnection,
+            isDockerDesktop
         } = ctx;
 
-        const isLinux = ctx.platform === 'linux';
-        const isNativeLinux = isLinux && !ctx.isWsl;
-        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+        const hostMachine = !isDockerDesktop ? '127.0.0.1' : 'host.docker.internal';
 
         const [tableResponse] = await databaseConnection.query(
             'SELECT * FROM information_schema.tables WHERE table_schema = \'magento\' AND table_name = \'admin_user\' LIMIT 1;'
@@ -73,8 +73,6 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 await databaseConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
             }
         }
-
-        const { mariadb: { env } } = docker.getContainers(ports);
         const envPhpData = await envPhpToJson(ctx);
 
         const envPhpHaveEncryptionKey = envPhpData && envPhpData.crypt && envPhpData.crypt.key && envPhpData.crypt.key;
@@ -127,9 +125,9 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 --cache-backend-redis-port='${ ports.redis }' \
                 --cache-backend-redis-db='0't \
                 --db-host='${ hostMachine }:${ ports.mariadb }' \
-                --db-name='${ env.MARIADB_DATABASE }' \
-                --db-user='${ env.MARIADB_USER }' \
-                --db-password='${ env.MARIADB_PASSWORD }' \
+                --db-name='${ defaultMagentoDatabase }' \
+                --db-user='${ defaultMagentoUser.user }' \
+                --db-password='${ defaultMagentoUser.password }' \
                 --backend-frontname='${ magentoConfiguration.adminuri }' \
                 --no-interaction`;
 

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -17,7 +17,7 @@ module.exports = () => ({
             databaseConnection
         } = ctx;
         const isNgrok = host.endsWith('ngrok.io');
-        const enableSecureFrontend = ssl.enabled ? '1' : '0';
+        const enableSecureFrontend = (ctx.config.overridenConfiguration.configuration.varnish.enabled && ssl.enabled) ? '1' : '0';
         const location = `${host}${ !isNgrok && ports.sslTerminator !== 80 ? `:${ports.sslTerminator }` : '' }/`;
         const secureLocation = `${host}/`; // SSL will work only on port 443, so you cannot run multiple projects with SSL at the same time.
         const httpUrl = `http://${location}`;

package/lib/tasks/magento/setup-magento/set-mail-config.js

@@ -0,0 +1,26 @@
+const { updateTableValues } = require('../../../util/database');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const setMailConfig = () => ({
+    title: 'Setting up mail configuration',
+    task: async ({ databaseConnection, ports, isDockerDesktop }, task) => {
+        await updateTableValues('core_config_data', [
+            {
+                path: 'system/smtp/port',
+                value: `${ ports.maildevSMTP }`
+            },
+            {
+                path: 'system/smtp/disable',
+                value: '0'
+            },
+            {
+                path: 'system/smtp/host',
+                value: isDockerDesktop ? 'host.docker.internal' : 'localhost'
+            }
+        ], { databaseConnection, task });
+    }
+});
+
+module.exports = setMailConfig;

package/lib/tasks/magento/setup-magento/varnish-config.js

@@ -1,6 +1,4 @@
-const os = require('os');
 const { updateTableValues } = require('../../../util/database');
-const getIsWsl = require('../../../util/is-wsl');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -20,18 +18,15 @@ const varnishConfigSetup = () => ({
             },
             databaseConnection,
             ports,
-            debug
+            debug,
+            isDockerDesktop
         } = ctx;
 
-        const isLinux = os.platform() === 'linux';
-        const isWsl = await getIsWsl();
-        const isNativeLinux = isLinux && !isWsl;
-
         if (!debug && varnishEnabled) {
             await updateTableValues('core_config_data', [
                 {
                     path: 'system/full_page_cache/varnish/backend_host',
-                    value: !isNativeLinux ? 'host.docker.internal' : 'localhost'
+                    value: isDockerDesktop ? 'host.docker.internal' : 'localhost'
                 },
                 {
                     path: 'system/full_page_cache/varnish/backend_port',
@@ -39,7 +34,7 @@ const varnishConfigSetup = () => ({
                 },
                 {
                     path: 'system/full_page_cache/varnish/access_list',
-                    value: !isNativeLinux ? 'host.docker.internal,localhost' : 'localhost'
+                    value: isDockerDesktop ? 'host.docker.internal,localhost' : 'localhost'
                 },
                 {
                     path: 'system/full_page_cache/caching_application',

package/lib/tasks/magento/setup-magento/waiting-for-varnish.js

@@ -4,9 +4,9 @@ const fs = require('fs');
 const path = require('path');
 const { request } = require('smol-request');
 const KnownError = require('../../../errors/known-error');
-const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const { NginxParser } = require('../../../util/nginx-logs-parser');
 const sleep = require('../../../util/sleep');
+const { containerApi } = require('../../docker/containers');
 
 const pathToWorkingHealthCheckPhp = path.join(__dirname, '..', '..', 'php', 'working_health_check.php');
 const pathToProjectsHealthCheckPhp = path.join(process.cwd(), 'pub', 'health_check.php');
@@ -17,19 +17,18 @@ const pathToHealthCheckBackupPhp = path.join(process.cwd(), 'pub', 'health_check
  */
 const getIsHealthCheckRequestBroken = async (ctx) => {
     const { nginx } = ctx.config.docker.getContainers(ctx.ports);
-
-    const nginxLogs = await execAsyncSpawn(`docker logs ${nginx.name}`);
-
-    const healthCheckRequests = nginxLogs
-        .split('\n')
-        .filter((line) => line.includes('"GET /health_check.php HTTP/1.1"'));
-
-    // eslint-disable-next-line max-len
-    const parser = new NginxParser('$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"');
-
-    const parsedRequests = healthCheckRequests.map((line) => parser.parseLine(line));
-
-    return parsedRequests.every((parsedRequest) => parsedRequest.status !== '200');
+    const parser = new NginxParser(
+        '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"'
+    );
+    const parsedLogs = await containerApi.logs({
+        name: nginx.name,
+        parser: (line) => parser.parseLine(line)
+    });
+
+    const healthCheckRequests = parsedLogs
+        .filter((line) => line.request.includes('/health_check.php'));
+
+    return healthCheckRequests.every((parsedRequest) => parsedRequest.status !== '200');
 };
 
 /**
@@ -37,12 +36,14 @@ const getIsHealthCheckRequestBroken = async (ctx) => {
  */
 const waitingForVarnish = () => ({
     title: 'Waiting for Varnish to return code 200',
-    skip: (ctx) => ctx.debug || !ctx.config.overridenConfiguration.configuration.varnish.enabled,
+    skip: (ctx) => ctx.debug
+        || !ctx.config.overridenConfiguration.configuration.varnish.enabled
+        || ctx.config.overridenConfiguration.ssl.enabled
+        || !ctx.config.overridenConfiguration.configuration.varnish.healthCheck,
     task: async (ctx, task) => {
         const pureMagentoVersion = ctx.magentoVersion.match(/^([0-9]+\.[0-9]+\.[0-9]+)/)[1];
 
         const isMagento23 = semver.satisfies(pureMagentoVersion, '<2.4');
-
         let tries = 0;
         while (tries < 10) {
             try {

package/lib/tasks/php/php-container.js

@@ -10,9 +10,13 @@ const { containerApi } = require('../docker/containers');
 const runPHPContainerCommand = async (ctx, command, options = {}) => {
     const { php } = ctx.config.docker.getContainers(ctx.ports);
 
-    const containers = await containerApi.ls({ formatToJSON: true, all: true });
+    const containers = await containerApi.ls({
+        formatToJSON: true,
+        all: true,
+        filter: `name=${php.name}`
+    });
 
-    if (containers.some((c) => c.Names === php.name)) {
+    if (containers.length > 0) {
         return execPHPContainerCommand(ctx, command, options);
     }
 
@@ -25,7 +29,7 @@ const runPHPContainerCommand = async (ctx, command, options = {}) => {
             },
             options.useXDebugContainer
                 ? {
-                    image: `${ php.image }.xdebug`
+                    image: php.debugImage
                 }
                 : {},
             {

package/lib/tasks/php/update-env-php.js

@@ -19,11 +19,10 @@ const updateEnvPHP = () => ({
             return;
         }
 
+        const { isDockerDesktop, platform } = ctx;
         const { php } = ctx.config.docker.getContainers(ctx.ports);
 
-        const isLinux = ctx.platform === 'linux';
-        const isNativeLinux = isLinux && !ctx.isWsl;
-        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+        const hostMachine = !isDockerDesktop ? '127.0.0.1' : 'host.docker.internal';
 
         const useVarnish = (!ctx.debug && ctx.config.overridenConfiguration.configuration.varnish.enabled) ? '1' : '';
         const varnishHost = hostMachine;
@@ -78,7 +77,7 @@ const updateEnvPHP = () => ({
             image: php.image,
             detach: false,
             rm: true,
-            user: isLinux ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
+            user: platform === 'linux' ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
         });
 
         task.output = result;

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/composer-credentials.js

@@ -96,9 +96,9 @@ ${ logger.style.misc('Password') } (${ logger.style.misc('Private key') }):`,
         };
 
         const authJsonContent = JSON.stringify(authContent, null, 4);
-        const authEnvContent = `export COMPOSER_AUTH='${JSON.stringify(authContent)}'`;
+        const authEnvContent = `export COMPOSER_AUTH='${JSON.stringify(authContent, null, 0)}'`;
 
-        process.env.COMPOSER_AUTH = authJsonContent;
+        process.env.COMPOSER_AUTH = JSON.stringify(JSON.parse(authJsonContent), null, 0);
 
         if (configureLocation === 'auth.json') {
             await fs.promises.writeFile(authJsonPath, authJsonContent, 'utf-8');
@@ -175,7 +175,11 @@ Would you like to load them now?`
 
                     if (loadCredentialsFrom) {
                         const credentialsLine = lines.find((line) => line.startsWith('export COMPOSER_AUTH='));
-                        process.env.COMPOSER_AUTH = credentialsLine.replace('export COMPOSER_AUTH=', '').replace(/'/ig, '').trim();
+                        process.env.COMPOSER_AUTH = JSON.stringify(
+                            JSON.parse(credentialsLine.replace('export COMPOSER_AUTH=', '').replace(/'/ig, '').trim()),
+                            null,
+                            0
+                        );
                         problems.delete(MISSING_COMPOSER_AUTH_ENV);
                     }
                 }

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

@@ -0,0 +1,88 @@
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const os = require('os');
+const { cmaGlobalConfig } = require('../../../config/cma-config');
+const { getCachedPorts } = require('../../../config/get-port-config');
+const { getSystemConfigTask } = require('../../../config/system-config');
+const UnknownError = require('../../../errors/unknown-error');
+const { execCommandTask } = require('../../../util/exec-async-command');
+const createCacheFolder = require('../../cache/create-cache-folder');
+const { dockerApi } = require('../../docker');
+const { stopContainers } = require('../../docker/containers');
+const { getDockerEngineAndDesktopServiceStatus } = require('./running-status');
+const getMagentoVersionConfig = require('../../../config/get-magento-version-config');
+const checkConfigurationFile = require('../../../config/check-configuration-file');
+const getProjectConfiguration = require('../../../config/get-project-configuration');
+const getDockerVersion = require('./version');
+
+const USE_DEFAULT_DOCKER_DESKTOP_CONTEXT_ANSWER = 'useDefaultDockerDesktopContext';
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const checkDockerDesktopContext = () => ({
+    task: async (ctx, task) => {
+        if (os.platform() !== 'linux' || !ctx.isDockerDesktop) {
+            task.skip();
+            return;
+        }
+
+        task.title = 'Checking contexts for Docker Desktop';
+
+        const contexts = await dockerApi.context({ formatToJSON: true });
+        const currentlyUsedContext = contexts.find((c) => c.Current);
+
+        if (!currentlyUsedContext) {
+            throw new UnknownError('We haven\'t found contexts in Docker...');
+        }
+
+        const { engine } = await getDockerEngineAndDesktopServiceStatus();
+
+        if (currentlyUsedContext.Name !== 'default' && engine.exists) {
+            if (cmaGlobalConfig.get(USE_DEFAULT_DOCKER_DESKTOP_CONTEXT_ANSWER) === false) {
+                task.skip();
+                return;
+            }
+
+            const confirmContextChange = await task.prompt({
+                type: 'Select',
+                message: `Do you want to change current Docker Desktop context (${logger.style.code(currentlyUsedContext.Name)}) to ${logger.style.code('default')}?`,
+                choices: [
+                    {
+                        name: 'yes',
+                        message: 'Yes'
+                    },
+                    {
+                        name: 'no',
+                        message: 'No, I don\'t know what this means, but you can ask again on next start.'
+                    },
+                    {
+                        name: 'skip',
+                        // eslint-disable-next-line max-len
+                        message: 'I do know what this means and I DON\'T want to change context for Docker. Also, save this answer to never ask again.'
+                    }
+                ]
+            });
+
+            if (confirmContextChange === 'skip') {
+                cmaGlobalConfig.set(USE_DEFAULT_DOCKER_DESKTOP_CONTEXT_ANSWER, false);
+                task.skip();
+            }
+
+            if (confirmContextChange === 'yes') {
+                return task.newListr([
+                    getMagentoVersionConfig(),
+                    checkConfigurationFile(),
+                    getProjectConfiguration(),
+                    createCacheFolder(),
+                    getSystemConfigTask(),
+                    getCachedPorts(),
+                    stopContainers(),
+                    execCommandTask('docker context use default'),
+                    getDockerVersion()
+                ]);
+            }
+        }
+    }
+});
+
+module.exports = checkDockerDesktopContext;

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

@@ -1,17 +1,23 @@
+const os = require('os');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const { cmaGlobalConfig } = require('../../../config/cma-config');
 const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const openBrowser = require('../../../util/open-browser');
-const installDocker = require('./install');
+const checkDockerDesktopContext = require('./context');
+const { installDockerEngine } = require('./install');
 const installDockerOnMac = require('./install-on-mac');
 const { checkDockerPerformance } = require('./performance');
 const { checkDockerSocketPermissions } = require('./permissions');
-const checkDockerStatus = require('./running-status');
+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}`;
@@ -19,32 +25,72 @@ const setVersionInContextTask = (task) => ({
     }
 });
 
-const dockerInstallPromptLinux = async (task) => {
-    const automaticallyInstallDocker = await task.prompt({
-        type: 'Confirm',
+const dockerInstallPromptLinux = async (task, { skipPrompt = false } = {}) => {
+    const automaticallyInstallDocker = skipPrompt ? 'yes' : await task.prompt({
+        type: 'Select',
         message: `You don't have Docker installed!
 Do you want to install it automatically?
-NOTE: After installation it's recommended to log out and log back in so your group membership is re-evaluated!`
+`,
+        choices: [
+            {
+                name: 'yes',
+                message: 'Yes, I to install Docker automatically'
+            },
+            {
+                name: 'no',
+                message: 'No, I want to install Docker myself'
+            },
+            {
+                name: 'skip',
+                message: 'Skip installing Docker'
+            }
+        ]
     });
 
-    if (automaticallyInstallDocker) {
+    if (automaticallyInstallDocker === 'yes') {
         return task.newListr([
-            installDocker(),
+            installDockerEngine(),
+            checkDockerSocketPermissions(),
             getDockerVersion(),
             {
-                task: (ctx) => {
+                task: async (ctx) => {
                     task.title = `Using docker version ${ctx.dockerVersion}`;
 
+                    const confirmLogOut = await task.prompt({
+                        type: 'Select',
+                        message: 'Docker installed successfully!\n',
+                        choices: [
+                            {
+                                name: 'log-out',
+                                message: `${logger.style.command('[Recommended]')} Now I will log out and log back it (or restart my system) to re-evaluate group membership`
+                            },
+                            {
+                                name: 'skip',
+                                message: 'Skip log out and proceed with installation'
+                            }
+                        ]
+                    });
+
+                    if (confirmLogOut === 'skip') {
+                        return;
+                    }
+
                     throw new KnownError(
                         `Docker is installed successfully!
-Please log out and log back to so your group membership is re-evaluated!
+Please log out and log back in (or restart your system) so your group membership is re-evaluated!
 Learn more here: ${ logger.style.link('https://docs.docker.com/engine/install/linux-postinstall/') }`
                     );
                 }
-            }
+            },
+            checkDockerStatus(),
+            checkDockerDesktopContext()
         ]);
     }
 
+    if (automaticallyInstallDocker === 'skip') {
+        return;
+    }
+
     throw new KnownError('Docker is not installed!');
 };
 
@@ -64,7 +110,8 @@ const dockerInstallPromptMacOS = async (task) => {
     const confirmationToInstallDocker = await task.prompt({
         type: 'Select',
         message: `You don't have Docker installed!
-Would you like to install it automatically using brew cask or you prefer to install it manually?`,
+Would you like to install it automatically using brew cask or you prefer to install it manually?
+`,
         choices: [
             {
                 name: 'automatic',
@@ -80,6 +127,7 @@ Would you like to install it automatically using brew cask or you prefer to inst
     if (confirmationToInstallDocker === 'automatic') {
         return task.newListr([
             installDockerOnMac(),
+            checkDockerSocketPermissions(),
             checkDockerStatus(),
             getDockerVersion(),
             setVersionInContextTask(task)
@@ -106,24 +154,71 @@ const checkDocker = () => ({
         });
 
         if (code !== 0) {
-            if (ctx.platform === 'linux' && !ctx.isWsl) {
-                const result = await dockerInstallPromptLinux(task);
-                if (result) {
-                    return result;
+            if (os.platform() === 'linux') {
+                const isWsl = await getIsWsl();
+                if (!isWsl) {
+                    const { engine } = await getDockerEngineAndDesktopServiceStatus();
+                    if (!engine.exists) {
+                        const result = await dockerInstallPromptLinux(task);
+                        if (result) {
+                            return result;
+                        }
+                    }
+                } else if (isWsl) {
+                    dockerInstallPromptWindows();
                 }
-            } else if (ctx.isWsl) {
-                dockerInstallPromptWindows();
             } else {
                 const result = await dockerInstallPromptMacOS(task);
                 if (result) {
                     return result;
                 }
             }
+        } else if (os.platform() === 'linux') {
+            const { engine, desktop } = await getDockerEngineAndDesktopServiceStatus();
+            if (!engine.exists
+                && desktop.exists
+                && cmaGlobalConfig.get(USE_DOCKER_ENGINE_WITH_DOCKER_DESKTOP_ANSWER) !== false
+            ) {
+                const confirmInstallingDockerEngine = await task.prompt({
+                    type: 'Select',
+                    message: `Looks like you have Docker Desktop installed on Linux system, but Docker Engine is not installed.
+Do you want to install it and use it's context together with Docker Desktop?
+`,
+                    choices: [
+                        {
+                            name: 'yes',
+                            message: 'Sure, if it means I will have less issues with my setup!'
+                        },
+                        {
+                            name: 'no',
+                            message: 'No. But you can ask me again later.'
+                        },
+                        {
+                            name: 'skip',
+                            message: 'No. And don\'t ask me again.'
+                        }
+                    ]
+                });
+
+                if (confirmInstallingDockerEngine === 'skip') {
+                    cmaGlobalConfig.set(USE_DOCKER_ENGINE_WITH_DOCKER_DESKTOP_ANSWER, false);
+                } else if (confirmInstallingDockerEngine === 'yes') {
+                    const result = await dockerInstallPromptLinux(task, {
+                        skipPrompt: true
+                    });
+
+                    if (result) {
+                        return result;
+                    }
+                }
+            }
         }
 
         return task.newListr([
+            checkDockerSocketPermissions(),
             checkDockerStatus(),
             getDockerVersion(),
+            checkDockerDesktopContext(),
             setVersionInContextTask(task)
         ]);
     }
@@ -134,7 +229,6 @@ const checkDocker = () => ({
  */
 module.exports = () => ({
     task: (ctx, task) => task.newListr([
-        checkDockerSocketPermissions(),
         checkDocker(),
         checkDockerPerformance()
     ], {

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

@@ -17,8 +17,8 @@ const postInstallSteps = [
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
-const installDocker = () => ({
-    title: 'Installing Docker',
+const installDockerEngine = () => ({
+    title: 'Installing Docker Engine',
     task: async (ctx, task) => {
         const distro = await osPlatform();
         switch (distro) {
@@ -32,12 +32,21 @@ const installDocker = () => ({
                 ...postInstallSteps
             ]);
         }
-        case 'Fedora':
+        case 'Fedora': {
+            return task.newListr([
+                executeSudoCommand('sudo dnf -y install dnf-plugins-core'),
+                executeSudoCommand('sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo'),
+                executeSudoCommand('sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin'),
+                enableAndStartDockerCommand(),
+                ...postInstallSteps
+            ]);
+        }
         case 'CentOS': {
             return task.newListr([
-                downloadDockerInstallScriptCommand(),
-                runDockerInstallScriptCommand(),
-                enableAndStartDockerCommand()
+                executeSudoCommand('sudo yum install -y yum-utils'),
+                executeSudoCommand('sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo'),
+                executeSudoCommand('sudo yum install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin'),
+                ...postInstallSteps
             ]);
         }
         case 'Ubuntu': {
@@ -53,7 +62,12 @@ const installDocker = () => ({
 Your distro ${distro} is not supported by automatic installation.`);
         }
         }
+    },
+    options: {
+        bottomBar: 10
     }
 });
 
-module.exports = installDocker;
+module.exports = {
+    installDockerEngine
+};