@scandipwa/magento-scripts 2.0.0-alpha.4 → 2.0.0-alpha.7

package/lib/config/docker.js

@@ -273,7 +273,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
 
         if (ssl.enabled) {
-            dockerConfig.nginx.ports.push(
+            dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             );
         }

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

@@ -12,20 +12,25 @@ upstream app_backend {
 server {
     listen <%= it.hostPort %>;
 <% if (it.config.ssl.enabled) { %>  listen 443 ssl;
-    server_name <%= it.networkToBindTo %>;
 
+    ssl on;
     ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
     ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
     ssl_protocols TLSv1.2;<% } %>
 
-    server_name <% if (it.config.host) { %><%= it.config.host %><% } else { %>_<% } %>;
+     <% if (it.config.host) { %>
+    server_name <%= it.config.host %><% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } %>;
+    <% } else { %>
+    server_name <% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } else { %>_<% } %>;
+    <% } %>
 
     location / {
         proxy_buffer_size   128k;
         proxy_buffers   4 256k;
         proxy_busy_buffers_size   256k;
         proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Host $http_host;
         proxy_http_version 1.1;
         proxy_set_header Connection "";

package/lib/config/versions/magento-2.3.7-p4.js

@@ -0,0 +1,44 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.3.7-p4',
+    configuration: {
+        php: php74({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.3`
+        }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '7.9.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,46 @@
+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 { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
+
+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: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,46 @@
+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 { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+
+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: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,46 @@
+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 { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+
+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: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.17.5'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -68,9 +68,9 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
         .comment('project image')
         .from({ image, tag });
 
-    // install bash in image
+    // install bash and patch in image
     dockerFileInstructions
-        .run('apk add --no-cache bash');
+        .run('apk add --no-cache bash patch');
 
     if (missingExtensions.length > 0) {
         const allDependencies = missingExtensions.map(

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/waiting-for-varnish.js

@@ -37,7 +37,9 @@ 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,
     task: async (ctx, task) => {
         const pureMagentoVersion = ctx.magentoVersion.match(/^([0-9]+\.[0-9]+\.[0-9]+)/)[1];
 

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.4",
+    "version": "2.0.0-alpha.7",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "f447e467a64cb3a4b83a22a9ac54055918266198"
+    "gitHead": "c965b81745323f4b3dce11965d49b2de32a4d79c"
 }