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

package/lib/config/docker.js

@@ -50,8 +50,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         elasticsearch: {
             name: `${ prefix }_elasticsearch-data`
         },
-        composer_home: {
-            name: 'composer_home-data'
+        composer_cache: {
+            name: 'composer_cache-data',
+            opts: {
+                mode: 'z'
+            }
         }
     };
 
@@ -139,13 +142,12 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 network: isDockerDesktop ? network.name : 'host',
                 mountVolumes: [
                     `${ !isDockerDesktop ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
-                    `${ volumes.composer_home.name }:/composer/home`,
+                    `${ volumes.composer_cache.name }:/composer/home/cache`,
                     `${ php.iniPath }:/usr/local/etc/php/php.ini`,
                     `${ php.fpmConfPath }:/usr/local/etc/php-fpm.d/zz-docker.conf`
                 ].concat(ctx.debug ? [`${ php.debugIniPath }:/usr/local/etc/php/conf.d/00-xdebug.ini`] : []),
                 env: {
-                    COMPOSER_AUTH: JSON.stringify(JSON.parse(process.env.COMPOSER_AUTH), null, 0) || '',
-                    COMPOSER_HOME: '/composer/home'
+                    COMPOSER_AUTH: JSON.stringify(JSON.parse(process.env.COMPOSER_AUTH), null, 0) || ''
                 },
                 restart: 'on-failure:5',
                 image: `local-cma-project:${ prefix }`,

package/lib/config/services/composer/versions/composer-1.js

@@ -2,7 +2,12 @@
  * @returns {import('../../../../../typings/index').ComposerConfiguration}
  */
 const composer1 = () => ({
-    version: '1'
+    version: '1',
+    plugins: {
+        'hirak/prestissimo': {
+            enabled: true
+        }
+    }
 });
 
 module.exports = composer1;

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

@@ -0,0 +1,39 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
+const { composer1 } = require('../services/composer/versions');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
+const { nginx118 } = require('../services/nginx/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.2.10',
+    configuration: {
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '5.0'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: elasticsearch68(),
+        composer: composer1(),
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/tasks/docker/convert-composer-home-to-composer-cache-volume.js

@@ -0,0 +1,43 @@
+const { containerApi } = require('./containers');
+const volumeApi = require('./volume/volume-api');
+
+const composeHomeDataVolumeName = 'composer_home-data';
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const convertComposerHomeToComposerCacheVolume = () => ({
+    skip: async () => {
+        const volumeList = await volumeApi.ls({
+            formatToJSON: true,
+            filter: `name=${ composeHomeDataVolumeName }`
+        });
+
+        return volumeList.length === 0;
+    },
+    task: async (ctx, task) => {
+        if (ctx.platform === 'linux' && !ctx.isDockerDesktop) {
+            await volumeApi.rm({ volumes: [composeHomeDataVolumeName] });
+            return;
+        }
+
+        const { composer_cache } = ctx.config.docker.volumes;
+        task.title = `Migrating from ${ composer_cache.name } volume to ${ composeHomeDataVolumeName }...`;
+        await containerApi.run({
+            rm: true,
+            detach: false,
+            mountVolumes: [
+                `${ composeHomeDataVolumeName }:/from:ro`,
+                `${ composer_cache.name }:/to`
+            ],
+            image: 'alpine',
+            command: 'ash -c "cd /from/cache; cp -av . /to"'
+        });
+
+        await volumeApi.rm({ volumes: [composeHomeDataVolumeName] });
+    }
+});
+
+module.exports = {
+    convertComposerHomeToComposerCacheVolume
+};

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

@@ -1,6 +1,6 @@
 const path = require('path');
+const os = require('os');
 const { DockerFileBuilder } = require('../../util/dockerfile-builder');
-const semver = require('semver');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const KnownError = require('../../errors/known-error');
 const { runContainerImage } = require('../../util/run-container-image');
@@ -93,12 +93,27 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
         .comment('make composer executable')
         .run('chmod +x ./composer')
         .comment('move composer to bin directory')
-        .run('mv composer /usr/local/bin/composer');
+        .run('mv composer /usr/local/bin/composer')
+        .run('mkdir -p /composer/home/cache')
+        .env({
+            COMPOSER_HOME: '/composer/home',
+            COMPOSER_CACHE_DIR: '/composer/home/cache'
+        });
+
+    if (composer.plugins && Object.values(composer.plugins).length > 0) {
+        for (const [pluginName, pluginOptions] of Object.entries(composer.plugins)) {
+            if (pluginOptions.enabled) {
+                dockerFileInstructions
+                    .comment(`install ${pluginName} composer global package`)
+                    // eslint-disable-next-line max-len
+                    .run(`composer global require ${pluginName}${ pluginOptions.options ? ` ${pluginOptions.options}` : '' }${ pluginOptions.options ? ` ${pluginOptions.options}` : ''}`);
+            }
+        }
+    }
 
-    if (semver.satisfies(composer.version, '^1')) {
+    if (!ctx.isDockerDesktop) {
         dockerFileInstructions
-            .comment('install prestissimo composer plugin')
-            .run('composer global require hirak/prestissimo');
+            .run(`chown -R ${os.userInfo().uid}:${os.userInfo().gid} /composer/home`);
     }
 
     dockerFileInstructions

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

@@ -86,8 +86,8 @@ const removeLocalVolumes = () => ({
             await Promise.all(existingLocalVolumesDetails.map(async (v) => {
                 if (v.Containers && Object.entries(v.Containers).length > 0) {
                     await Promise.all(Object.values(v.Containers).map(async (c) => {
-                        await containerApi.stop(c.Name);
-                        await containerApi.rm(c.Name);
+                        await containerApi.stop([c.Name]);
+                        await containerApi.rm([c.Name]);
                     }));
                 }
             }));

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

@@ -89,7 +89,7 @@ const rm = async (options, execOptions = {}) => {
  */
 const inspect = async (options, execOptions = {}) => {
     const {
-        image: volume,
+        volume,
         format,
         formatToJSON = false
     } = options;

package/lib/tasks/start.js

@@ -29,6 +29,7 @@ const volumes = require('./docker/volume/tasks');
 const convertMySQLDatabaseToMariaDB = require('./docker/convert-mysql-to-mariadb');
 const { cmaGlobalConfig } = require('../config/cma-config');
 const { setProjectConfigTask } = require('./project-config');
+const { convertComposerHomeToComposerCacheVolume } = require('./docker/convert-composer-home-to-composer-cache-volume');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -123,6 +124,7 @@ const configureProject = () => ({
         getComposerVersionTask(),
         prepareFileSystem(),
         volumes.createVolumes(),
+        convertComposerHomeToComposerCacheVolume(),
         installMagentoProject(),
         enableMagentoComposerPlugins(),
         startServices(),

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

@@ -116,7 +116,17 @@ const composerConfigurationSchema = Joi.object({
         }
 
         return versionValidator(value);
-    })
+    }),
+    plugins: Joi.object()
+        .pattern(
+            Joi.string(),
+            Joi.object({
+                version: Joi.string().optional(),
+                options: Joi.string().optional(),
+                enabled: Joi.boolean().optional()
+            })
+                .unknown()
+        )
 });
 
 /**

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

@@ -45,12 +45,10 @@ const runInContainer = (options, commands) => {
         tty: true,
         detach: false,
         rm: true,
-        command: commands.map((command) => command.split(' ')).flat().join(' ')
+        command: commands.join(' ')
     });
 
-    const args = runArgs.slice(1).map((command) => command.split(' ')).flat();
-
-    spawn('docker', args, { stdio: [0, 1, 2] });
+    spawn('bash', ['-c', runArgs.join(' ')], { stdio: [0, 1, 2] });
 
     return new Promise((_resolve) => {
         // never resolve

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "2.0.0-alpha.15",
+    "version": "2.0.0-alpha.17",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "df32030f4809af581a3ff909f215d31f74bc0207"
+    "gitHead": "8c4f3c41e8c96d259e22748b47d1b3a524af12f8"
 }

package/typings/index.d.ts

@@ -87,6 +87,10 @@ export interface ComposerConfiguration {
     plugins: Record<string, {
         version?: string
         options?: string
+        /**
+         * Enable composer plugin
+         */
+        enabled?: boolean
     }>
 }