@scandipwa/magento-scripts 1.16.0-alpha.0 → 1.16.0-alpha.3

package/lib/config/docker.js

@@ -206,9 +206,10 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     '--log_bin_trust_function_creators=1',
                     '--default-authentication-plugin=mysql_native_password',
                     '--max_allowed_packet=1GB',
-                    '--bind-address=0.0.0.0',
-                    '--secure-file-priv=NULL'
-                ].join(' '),
+                    '--bind-address=0.0.0.0'
+                ]
+                    .concat(!isArm ? ['--secure-file-priv=NULL'] : [])
+                    .join(' '),
                 securityOptions: [
                     'seccomp=unconfined'
                 ],
@@ -281,7 +282,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 restart: 'on-failure:30',
                 network: isNotNativeLinux ? network.name : 'host',
                 // eslint-disable-next-line max-len
-                command: `/bin/bash -c "varnishd -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s malloc,512m && varnishlog"`,
+                command: `/bin/bash -c "varnishd -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
                 ]

package/lib/config/templates/nginx.template.conf

@@ -1,6 +1,8 @@
 upstream fastcgi_backend {
     # use tcp connection
     server <%= it.hostMachine %>:<%= it.ports.fpm %>;
+
+    keepalive 16;
 }
 
 server {
@@ -163,6 +165,7 @@ server {
         fastcgi_read_timeout 600s;
         fastcgi_connect_timeout 600s;
 
+        fastcgi_keep_conn on;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;

package/lib/config/templates/ssl-terminator.template.conf

@@ -3,6 +3,12 @@ set_real_ip_from 10.0.0.0/8;
 set_real_ip_from 172.0.0.0/8;
 real_ip_recursive on;
 
+upstream app_backend {
+    server <%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+
+    keepalive 16;
+}
+
 server {
     listen <%= it.hostPort %>;
 <% if (it.config.ssl.enabled) { %>  listen 443 ssl;
@@ -28,6 +34,6 @@ server {
         proxy_read_timeout          300;
         send_timeout                300;
 
-        proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+        proxy_pass http://app_backend;
     }
 }

package/lib/tasks/docker/containers.js

@@ -1,5 +1,6 @@
 /* eslint-disable max-len */
 const { execAsyncSpawn } = require('../../util/exec-async-command');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 
 /**
  * @param {Object} options
@@ -89,7 +90,8 @@ const pullContainers = () => ({
             .join(' ');
         const existingImages = await execAsyncSpawn(`docker images ${containerFilters}`);
         const missingContainerImages = containers.filter((container) => !existingImages.split('\n')
-            .some((line) => line.includes(container.imageDetails.name) && line.includes(container.imageDetails.tag)));
+            .some((line) => line.includes(container.imageDetails.name) && line.includes(container.imageDetails.tag)))
+            .reduce((acc, val) => acc.concat(acc.some((c) => c.imageDetails.name === val.imageDetails.name && c.imageDetails.tag === val.imageDetails.tag) ? [] : val), []);
 
         if (missingContainerImages.length === 0) {
             task.skip();
@@ -98,7 +100,7 @@ const pullContainers = () => ({
 
         return task.newListr(
             missingContainerImages.map((container) => ({
-                title: `Pulling ${container._} image`,
+                title: `Pulling ${ logger.style.file(`${container.imageDetails.name}:${container.imageDetails.tag}`) } image`,
                 task: () => pull(`${container.imageDetails.name}:${container.imageDetails.tag}`)
             })), {
                 concurrent: true,

package/lib/tasks/magento/enable-magento-composer-plugins.js

@@ -75,7 +75,7 @@ const enableMagentoComposerPlugins = () => ({
             return;
         }
 
-        task.title = 'Checking allowed composer plugins...';
+        task.title = 'Checking allowed Composer plugins...';
 
         const composerPlugins = await getInstalledComposerPlugins();
         const composerJsonData = await getJsonfileData(composerJsonPath);

package/lib/tasks/php/extensions/index.js

@@ -1,11 +1,9 @@
 /* eslint-disable max-len */
 const path = require('path');
 const fs = require('fs');
-const os = require('os');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const pathExists = require('../../../util/path-exists');
 const phpbrewConfig = require('../../../config/phpbrew');
-const { getArch } = require('../../../util/arch');
 
 /**
  * Get enabled extensions list with versions
@@ -13,9 +11,9 @@ const { getArch } = require('../../../util/arch');
  * @returns {Promise<{[key: string]: string}}>}
  */
 const getEnabledExtensions = async ({ php }) => {
-    const isArmMac = await getArch() === 'arm64' && os.platform() === 'darwin';
     const output = await execAsyncSpawn(
-        `${isArmMac ? 'arch -x86_64 ' : ''}${ php.binPath } -c ${php.iniPath} -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`
+        `${ php.binPath } -c ${php.iniPath} -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`,
+        { useRosetta2: true }
     );
 
     return output
@@ -49,7 +47,7 @@ const getDisabledExtensions = async ({ php }) => {
         }
     );
 
-    return extensionIniList.filter((f) => f.isFile() && f.name.endsWith('.disabled')).map((f) => f.name.replace('.disabled', ''));
+    return extensionIniList.filter((f) => f.isFile() && f.name.endsWith('.disabled')).map((f) => f.name.replace('.ini.disabled', ''));
 };
 
 /**

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": "1.16.0-alpha.0",
+    "version": "1.16.0-alpha.3",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "e3d08c91ce20747b465b5b9edc1a4cd7737037ce"
+    "gitHead": "1801104ed104a124f8d08cc81008d21b792857e4"
 }