@scandipwa/magento-scripts 2.0.0 → 2.0.1

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p2',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3-p1',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p1',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p2',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 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 { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php73 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch76 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p1',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.6.2'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch76(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php73 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch76 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p2',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.6.2'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch76(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php73 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch76 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.6.2'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch76(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php73 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch77 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6-p1',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.7.1'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch77(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php73 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php73 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch77 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.3-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.7.1'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch77(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php74 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php74 } = require('../services/php/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis60 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb103 } = require('../services/mariadb/versions');
+const { elasticsearch79 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p1',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6'
-        },
+        redis: redis60(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.9.3'
-        },
+        mariadb: mariadb103(),
+        elasticsearch: elasticsearch79(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php74 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php74 } = require('../services/php/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis60 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb103 } = require('../services/mariadb/versions');
+const { elasticsearch79 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p2',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6'
-        },
+        redis: redis60(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.9.3'
-        },
+        mariadb: mariadb103(),
+        elasticsearch: elasticsearch79(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php74 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php74 } = require('../services/php/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis60 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb103 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p3',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6'
-        },
+        redis: redis60(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.9.3'
-        },
+        mariadb: mariadb103(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php74 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php74 } = require('../services/php/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis60 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb103 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p4',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6'
-        },
+        redis: redis60(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.9.3'
-        },
+        mariadb: mariadb103(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),