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

package/lib/config/templates/php.template.ini

@@ -1999,28 +1999,34 @@ opcache.save_comments=1
 
 [xdebug]
 <% if (it.debug) { %>
+error_reporting=E_ALL
+
+xdebug.idekey=PHPSTORM
 
 <% if (it.isXDebug2) { %>
 xdebug.remote_autostart=1
 xdebug.remote_enable=1
-xdebug.remote_host=127.0.0.1
-xdebug.remote_port=9111
 
-xdebug.idekey=PHPSTORM
+xdebug.remote_host=<%~ it.hostMachine %>
+
+xdebug.remote_port=9003
+
+xdebug.remote_log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 <% } else { %>
 
 xdebug.mode=debug
-xdebug.client_host=localhost
+xdebug.client_host=<%~ it.hostMachine %>
+
 xdebug.client_port=9003
-xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 ; THIS THING WILL BREAK PHP
 ; xdebug.start_with_request=yes
 
 xdebug.discover_client_host=false
 xdebug.start_upon_error=yes
-xdebug.idekey=PHPSTORM
+
+xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 <% } %>
 

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

@@ -4,7 +4,7 @@ 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 %><% } %>;
+    server <%= it.hostMachine %>:<% if (!it.debug && it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
 
     keepalive 16;
 }

package/lib/config/templates/vscode-launch.template.json

@@ -9,7 +9,9 @@
             "type": "php",
             "request": "launch",
             "port": <%~ it.XDebugPort %>,
-            "runtimeExecutable": "<%~ it.PHPBinPath %>"
+            "pathMappings": {
+                "<%~ it.baseConfig.containerMagentoDir %>": "${workspaceFolder}"
+            }
         }
     ]
 }

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

@@ -1,13 +1,20 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php72 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.0',
     configuration: {
-        php: php72({ templateDir }),
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '5.6.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php72 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
     configuration: {
-        php: php72({ templateDir }),
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

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

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php72 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p2',
     configuration: {
-        php: php72({ templateDir }),
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php72 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2',
     configuration: {
-        php: php72({ templateDir }),
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3-p1',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

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

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p2',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,20 @@
 const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -21,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
+        elasticsearch: elasticsearch68(),
         composer: {
             version: '1'
         },

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p1',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p2',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6-p1',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+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-p1',
     configuration: {
-        php: php74({ templateDir }),
+        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')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+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-p2',
     configuration: {
-        php: php74({ templateDir }),
+        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')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+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-p3',
     configuration: {
-        php: php74({ templateDir }),
+        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')

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

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+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',
     configuration: {
-        php: php74({ templateDir }),
+        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')