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

package/lib/config/versions/magento-2.4.1.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer1 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
@@ -15,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0.10-alpine'
         },
@@ -31,11 +30,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '1'
-        },
+        composer: composer1(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2-p1.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p1',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2-p2.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p2',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
@@ -15,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -31,11 +30,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3-p1.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3-p2.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3-p3.js

@@ -0,0 +1,44 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.3-p3',
+    isDefault: true,
+    configuration: {
+        php: php74({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: composer2(),
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/config/versions/magento-2.4.3.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.4-p1.js

@@ -0,0 +1,44 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.4-p1',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: composer2(),
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/config/versions/magento-2.4.4.js

@@ -1,11 +1,13 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php81 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish70({ templateDir }),
-        sslTerminator: sslTerminator({ templateDir })
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.5.js

@@ -0,0 +1,44 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.5',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.17.5'
+        },
+        composer: composer2(),
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -17,11 +17,13 @@ const createBashrcConfigFile = () => ({
                 overwrite: true,
                 templateArgs: {
                     php,
-                    varnishEnabled
+                    varnishEnabled,
+                    config: ctx.config,
+                    magentoVersion: ctx.magentoVersion
                 }
             });
         } 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/composer/local-auth-json.js

@@ -27,7 +27,7 @@ const localAuthJson = () => ({
                 throw new KnownError(`Your ./auth.json file does not contain the ${ logger.style.misc("{ 'http-basic': { 'repo.magento.com': <> } }") } field.`);
             }
 
-            process.env.COMPOSER_AUTH = localAuthJson;
+            process.env.COMPOSER_AUTH = JSON.stringify(JSON.parse(localAuthJson), null, 0);
         }
     },
     options: {

package/lib/tasks/database/connect-to-database.js

@@ -3,6 +3,8 @@ const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const sleep = require('../../util/sleep');
 const { createMagentoDatabase } = require('./create-magento-database');
+const { createMagentoUser } = require('./create-magento-user');
+const defaultMagentoUser = require('./default-magento-user');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -60,9 +62,9 @@ const gettingDatabaseConnection = () => ({
                 const connection = await mysql2.createConnection({
                     host: '127.0.0.1',
                     port: ports.mariadb,
-                    user: mariadb.env.MARIADB_USER,
-                    password: mariadb.env.MARIADB_PASSWORD,
-                    database: mariadb.env.MARIADB_DATABASE
+                    user: defaultMagentoUser.user,
+                    password: defaultMagentoUser.password,
+                    database: 'magento'
                 });
 
                 ctx.databaseConnection = connection;
@@ -101,6 +103,7 @@ const connectToDatabase = () => ({
     task: (ctx, task) => task.newListr([
         waitForDatabaseInitialization(),
         createMagentoDatabase(),
+        createMagentoUser(),
         terminatingExistingConnection(),
         gettingDatabaseConnection()
     ], {

package/lib/tasks/database/create-magento-database.js

@@ -1,4 +1,4 @@
-const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { containerApi } = require('../docker/containers');
 
 /**
  * Will create database 'magento' in MariaDB if it does not exist for some reason
@@ -9,7 +9,10 @@ const createMagentoDatabase = () => ({
     task: async (ctx, task) => {
         const { mariadb } = ctx.config.docker.getContainers();
         task.title = `Creating Magento database in ${ mariadb._ }`;
-        await execAsyncSpawn(`docker exec ${mariadb.name} mysql -umagento -pmagento -h 127.0.0.1 -e "CREATE DATABASE IF NOT EXISTS magento;"`);
+        await containerApi.exec(
+            `mysql -uroot -p${ mariadb.env.MARIADB_ROOT_PASSWORD } -h 127.0.0.1 -e "CREATE DATABASE IF NOT EXISTS magento;"`,
+            mariadb.name
+        );
     }
 });
 

package/lib/tasks/database/create-magento-user.js

@@ -0,0 +1,50 @@
+const mysql2 = require('mysql2/promise');
+const defaultMagentoUser = require('./default-magento-user');
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createMagentoUser = () => ({
+    title: 'Creating Magento user',
+    task: async (ctx, task) => {
+        const { mariadb } = ctx.config.docker.getContainers();
+        const connection = await mysql2.createConnection({
+            host: '127.0.0.1',
+            port: ctx.ports.mariadb,
+            user: 'root',
+            password: mariadb.env.MARIADB_ROOT_PASSWORD
+        });
+
+        const result = await connection.query('select Host, User from mysql.user;');
+
+        if (result.length === 0) {
+            task.skip();
+            return;
+        }
+
+        const [users] = result;
+
+        if (users.some((user) => user.User === defaultMagentoUser.user && user.Host === '%')) {
+            task.skip();
+            return;
+        }
+
+        if (users.some((user) => user.User === defaultMagentoUser.user)) {
+            const magentoUser = users.find((user) => user.User === defaultMagentoUser.user);
+
+            await connection.query(`DROP USER '${ magentoUser.User }'@'${ magentoUser.Host }'`);
+        }
+
+        await connection.query(
+            `CREATE USER '${ defaultMagentoUser.user }'@'${ defaultMagentoUser.host }' IDENTIFIED BY '${ defaultMagentoUser.password }';`
+        );
+        await connection.query(`GRANT ALL PRIVILEGES ON *.* TO '${ defaultMagentoUser.user }'@'${ defaultMagentoUser.host }' WITH GRANT OPTION;`);
+        await connection.query('FLUSH PRIVILEGES;');
+
+        await connection.destroy();
+    }
+});
+
+module.exports = {
+    createMagentoUser
+};

package/lib/tasks/database/default-magento-database.js

@@ -0,0 +1,3 @@
+module.exports = {
+    defaultMagentoDatabase: 'magento'
+};

package/lib/tasks/database/default-magento-user.js

@@ -0,0 +1,7 @@
+const defaultMagentoUser = {
+    user: 'magento',
+    password: 'magento',
+    host: '%'
+};
+
+module.exports = defaultMagentoUser;

package/lib/tasks/database/import-dump-to-database.js

@@ -5,6 +5,7 @@ const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn, execCommandTask } = require('../../util/exec-async-command');
 const pathExists = require('../../util/path-exists');
 const connectToDatabase = require('./connect-to-database');
+const defaultMagentoUser = require('./default-magento-user');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -88,8 +89,8 @@ const executeImportDumpSQL = () => ({
                     message: `root (${logger.style.command('Probably safest option')})`
                 },
                 {
-                    name: `--user=${mariadb.env.MARIADB_USER} --password=${mariadb.env.MARIADB_PASSWORD}`,
-                    message: `${mariadb.env.MARIADB_USER}`
+                    name: `--user=${defaultMagentoUser.user} --password=${defaultMagentoUser.password}`,
+                    message: `${defaultMagentoUser.user}`
                 }
             ]
         });