@scandipwa/magento-scripts 1.14.1-alpha.6 → 1.14.1-alpha.9

package/lib/config/docker.js

@@ -43,6 +43,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
     const isLinux = os.platform() === 'linux';
     const isWsl = await getIsWsl();
     const isArm = (await getArch()) === 'arm64';
+    const isNotNativeLinux = (!isLinux || isWsl);
 
     if (!isLinux) {
         /**
@@ -53,7 +54,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_nginx-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(cacheDir, 'nginx', 'conf.d') }`,
+                device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
             }
         };
@@ -61,7 +62,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_pub-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'pub') }`,
+                device: path.join(magentoDir, 'pub'),
                 o: 'bind'
             }
         };
@@ -69,17 +70,25 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_setup-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'setup') }`,
+                device: path.join(magentoDir, 'setup'),
+                o: 'bind'
+            }
+        };
+        volumes.sslTerminator = {
+            name: `${ prefix }_ssl-terminator-data`,
+            opts: {
+                type: 'nfs',
+                device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
             }
         };
 
         if (varnish.enabled) {
             volumes.varnish = {
-                name: `${ prefix }_varnish-vcl-data`,
+                name: `${ prefix }_varnish-data`,
                 opts: {
                     type: 'nfs',
-                    device: `${ path.join(cacheDir, 'varnish') }`,
+                    device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
                 }
             };
@@ -88,9 +97,34 @@ module.exports = async ({ configuration, ssl, host }, config) => {
 
     const getContainers = (ports = {}) => {
         const dockerConfig = {
+            sslTerminator: {
+                _: 'SSL Terminator (Nginx)',
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
+                ] : [],
+                healthCheck: {
+                    cmd: 'service nginx status'
+                },
+                /**
+                 * Mount volumes directly on linux
+                 */
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
+                ],
+                restart: 'on-failure:5',
+                // TODO: use connect instead
+                network: isNotNativeLinux ? network.name : 'host',
+                image: `nginx:${ nginx.version }`,
+                imageDetails: {
+                    name: 'nginx',
+                    tag: nginx.version
+                },
+                name: `${ prefix }_ssl-terminator`,
+                command: "nginx -g 'daemon off;'"
+            },
             nginx: {
                 _: 'Nginx',
-                ports: (!isLinux || isWsl) ? [
+                ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.app }:80`
                 ] : [],
                 healthCheck: {
@@ -110,7 +144,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ],
                 restart: 'on-failure:5',
                 // TODO: use connect instead
-                network: (!isLinux || isWsl) ? network.name : 'host',
+                network: isNotNativeLinux ? network.name : 'host',
                 image: `nginx:${ nginx.version }`,
                 imageDetails: {
                     name: 'nginx',
@@ -215,17 +249,19 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     tag: varnish.version
                 },
                 name: `${ prefix }_varnish`,
-                mountVolumes: isLinux ? [
-                    `${ path.join(cacheDir, 'varnish') }:/etc/varnish`
-                ] : [
-                    `${ volumes.varnish.name }:/etc/varnish`
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
                 ],
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
+                ] : [],
                 env: {
                     VARNISH_SIZE: '2G'
                 },
                 restart: 'on-failure:30',
-                network: (!isLinux || isWsl) ? network.name : 'host',
-                command: `varnishd -F -a :${ ports.varnish } -t 600 -f /etc/varnish/default.vcl`,
+                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"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
                 ]

package/lib/config/get-port-config.js

@@ -26,6 +26,10 @@ const getAvailablePorts = () => ({
                     'utf-8'
                 )
             );
+            if (!ports.sslTerminator) {
+                ports.sslTerminator = ports.app;
+                ports.app = defaultPorts.app;
+            }
         }
         const {
             systemConfiguration: {
@@ -41,7 +45,7 @@ const getAvailablePorts = () => ({
             if (!isPortAvailable) {
                 throw new Error(`Port ${ctx.port} is not available`);
             } else {
-                availablePorts.app = ctx.port;
+                availablePorts.sslTerminator = ctx.port;
             }
         }
 

package/lib/config/port-config.js

@@ -54,8 +54,9 @@ const savePortsConfig = async (ports) => {
 
 // Map of default ports (key:value)
 const defaultPorts = {
-    app: 80,
+    app: 3031,
     varnish: 8080,
+    sslTerminator: 80,
     fpm: 9000,
     xdebug: 9111,
     mysql: 3306,

package/lib/config/ssl-terminator/index.js

@@ -0,0 +1,10 @@
+const path = require('path');
+
+const sslTerminator = ({ templateDir }) => ({
+    version: '1.18.0',
+    configTemplate: path.join(templateDir || '', 'ssl-terminator.template.conf')
+});
+
+module.exports = {
+    sslTerminator
+};

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

@@ -1,8 +1,3 @@
-real_ip_header X-Forwarded-For;
-set_real_ip_from 10.0.0.0/8;
-set_real_ip_from 172.0.0.0/8;
-real_ip_recursive on;
-
 upstream fastcgi_backend {
     # use tcp connection
     server <%= it.hostMachine %>:<%= it.ports.fpm %>;
@@ -10,16 +5,7 @@ upstream fastcgi_backend {
 
 server {
     listen <%= it.hostPort %>;
-    <% if (it.config.ssl.enabled) { %>listen 443 ssl;<% } %>
-
-    <% if (it.config.ssl.enabled) { %>server_name <%= it.networkToBindTo %>;
-
-    ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
-    ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
-    ssl_protocols TLSv1.2;<% } else if (it.config.host) { %>server_name <%= it.config.host %>;
-    <% } else { %>
     server_name _;
-    <% } %>
 
     set $MAGE_ROOT <%= it.mageRoot %>;
     resolver 127.0.0.11;

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

@@ -0,0 +1,27 @@
+real_ip_header X-Forwarded-For;
+set_real_ip_from 10.0.0.0/8;
+set_real_ip_from 172.0.0.0/8;
+real_ip_recursive on;
+
+server {
+    listen <%= it.hostPort %>;
+<% if (it.config.ssl.enabled) { %>  listen 443 ssl;
+    server_name <%= it.networkToBindTo %>;
+
+    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 { %>_<% } %>;
+
+    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 Host $http_host;
+
+        proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+    }
+}

package/lib/config/templates/varnish.template.vcl

@@ -7,19 +7,28 @@ import std;
 
 backend default {
     .host = "<%= it.hostMachine %>";
-    .port = "<%= it.hostPort %>";
+    .host_header = "Host: localhost";
+    .port = "<%= it.nginxPort %>";
     .first_byte_timeout = 600s;
     .probe = {
-        .url = "/health_check.php";
-        .timeout = 2s;
-        .interval = 5s;
-        .window = 10;
-        .threshold = 5;
+        # .url = "/health_check.php";
+        .request =
+            "GET /health_check.php HTTP/1.1"
+            "Host: localhost"
+            "Connection: close"
+            "User-Agent: Varnish Health Probe";
+        .interval  = 10s;
+        .timeout   = 5s;
+        .window    = 5;
+        .threshold = 3;
    }
 }
 
 acl purge {
     "<%= it.hostMachine %>";
+    "localhost";
+    "172.0.0.0"/8;
+    "192.168.0.0"/16;
 }
 
 sub vcl_recv {

package/lib/config/varnish/varnish-6-0.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish60 = ({ templateDir }) => ({
+    enabled: true,
+    version: '6.0',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish60
+};

package/lib/config/varnish/varnish-6-6.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish66 = ({ templateDir }) => ({
+    enabled: true,
+    version: '6.6',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish66
+};

package/lib/config/varnish/varnish-7-0.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish70 = ({ templateDir }) => ({
+    enabled: true,
+    version: '7.0',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish70
+};

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.0',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p2',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3-p1',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p2',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p1',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p2',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6-p1',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6',
@@ -44,11 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p1',
@@ -42,11 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p2',
@@ -42,11 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p3',
@@ -42,11 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',