@scandipwa/magento-scripts 2.0.0 → 2.0.1

package/lib/config/versions/magento-2.3.7.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',
@@ -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.4.0-p1.js

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento24PHPExtensionList } = 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 { 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 { varnish60 } = require('../varnish/varnish-6-0');
+const { varnish60 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0-p1',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch712(),
         composer: composer1(),
         varnish: varnish60({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,12 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento24PHPExtensionList } = 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 { 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 { varnish60 } = require('../varnish/varnish-6-0');
+const { varnish60 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0',
@@ -17,18 +20,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.2'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb102(),
+        elasticsearch: elasticsearch712(),
         composer: composer1(),
         varnish: varnish60({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1-p1',
@@ -18,18 +21,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0.10-alpine'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch712(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
@@ -18,18 +21,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0.10-alpine'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch712(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p1',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch712(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p2',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch712(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch712 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
@@ -18,18 +21,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.12.1'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch712(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p3',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php74 } = require('../php/versions');
+const { php74 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
-const { repo } = require('../php/base-repo');
+const { varnish66 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis60 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch710 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis60(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch710(),
         composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php81 } = require('../php/versions');
+const { php81 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish70 } = require('../varnish/varnish-7-0');
-const { repo } = require('../php/base-repo');
+const { varnish70 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis62 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4-p1',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis62(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),

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

@@ -0,0 +1,41 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../services/php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../services/php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish70 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+const { maildev } = require('../services/maildev');
+const { redis62 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.4-p2',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis62(),
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
+        composer: composer2(),
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -1,13 +1,16 @@
 const { defaultMagentoConfig } = require('../magento-config');
-const sodium = require('../php/extensions/sodium');
+const sodium = require('../services/php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
-const { php81 } = require('../php/versions');
+const { php81 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish70 } = require('../varnish/varnish-7-0');
-const { repo } = require('../php/base-repo');
+const { varnish70 } = require('../services/varnish');
+const { repo } = require('../services/php/base-repo');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer2 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis62 } = require('../services/redis');
+const { mariadb104 } = require('../services/mariadb/versions');
+const { elasticsearch716 } = require('../services/elasticsearch/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
@@ -19,18 +22,12 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '6.0'
-        },
+        redis: redis62(),
         mysql: {
             version: '8.0'
         },
-        mariadb: {
-            version: '10.4'
-        },
-        elasticsearch: {
-            version: '7.16.3'
-        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch716(),
         composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),