@scandipwa/magento-scripts 2.0.0-alpha.8 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (141) hide show
  1. package/lib/commands/cli.js +18 -1
  2. package/lib/commands/logs.js +28 -2
  3. package/lib/commands/start.js +24 -3
  4. package/lib/commands/status.js +9 -1
  5. package/lib/config/config.js +20 -2
  6. package/lib/config/dependencies-for-platforms.js +1 -1
  7. package/lib/config/docker.js +94 -54
  8. package/lib/config/get-project-configuration.js +5 -0
  9. package/lib/config/index.js +10 -3
  10. package/lib/config/php/versions/php-7.2.js +1 -0
  11. package/lib/config/php/versions/php-7.3.js +1 -0
  12. package/lib/config/php/versions/php-7.4.js +1 -0
  13. package/lib/config/php/versions/php-8.1.js +1 -0
  14. package/lib/config/php-config.js +4 -3
  15. package/lib/config/port-config.js +3 -1
  16. package/lib/config/services/composer/versions/composer-1.js +13 -0
  17. package/lib/config/services/composer/versions/composer-2.js +8 -0
  18. package/lib/config/services/composer/versions/index.js +4 -0
  19. package/lib/config/services/maildev/index.js +7 -0
  20. package/lib/config/services/nginx/versions/index.js +3 -0
  21. package/lib/config/services/nginx/versions/nginx-1.18.js +11 -0
  22. package/lib/config/{ssl-terminator → services/ssl-terminator}/index.js +3 -0
  23. package/lib/config/templates/magentorc.template +12 -5
  24. package/lib/config/templates/nginx.fastcgi_params.template +29 -0
  25. package/lib/config/templates/php-debug.template.ini +31 -0
  26. package/lib/config/templates/php-fpm.template.conf +1 -2
  27. package/lib/config/templates/php.template.ini +5 -201
  28. package/lib/config/templates/ssl-terminator.template.conf +2 -0
  29. package/lib/config/templates/varnish.template.vcl +20 -13
  30. package/lib/config/varnish/varnish-6-0.js +4 -0
  31. package/lib/config/varnish/varnish-6-6.js +4 -0
  32. package/lib/config/varnish/varnish-7-0.js +4 -0
  33. package/lib/config/versions/magento-2.2.10.js +41 -0
  34. package/lib/config/versions/magento-2.3.0.js +8 -10
  35. package/lib/config/versions/magento-2.3.1.js +8 -10
  36. package/lib/config/versions/magento-2.3.2-p1.js +8 -10
  37. package/lib/config/versions/magento-2.3.2-p2.js +8 -10
  38. package/lib/config/versions/magento-2.3.2.js +8 -10
  39. package/lib/config/versions/magento-2.3.3-p1.js +8 -10
  40. package/lib/config/versions/magento-2.3.3.js +8 -10
  41. package/lib/config/versions/magento-2.3.4-p1.js +8 -10
  42. package/lib/config/versions/magento-2.3.4-p2.js +8 -10
  43. package/lib/config/versions/magento-2.3.4.js +8 -10
  44. package/lib/config/versions/magento-2.3.5-p1.js +8 -10
  45. package/lib/config/versions/magento-2.3.5-p2.js +8 -10
  46. package/lib/config/versions/magento-2.3.5.js +8 -10
  47. package/lib/config/versions/magento-2.3.6-p1.js +8 -10
  48. package/lib/config/versions/magento-2.3.6.js +8 -10
  49. package/lib/config/versions/magento-2.3.7-p1.js +8 -10
  50. package/lib/config/versions/magento-2.3.7-p2.js +8 -10
  51. package/lib/config/versions/magento-2.3.7-p3.js +8 -10
  52. package/lib/config/versions/magento-2.3.7-p4.js +8 -10
  53. package/lib/config/versions/magento-2.3.7.js +8 -10
  54. package/lib/config/versions/magento-2.4.0-p1.js +8 -10
  55. package/lib/config/versions/magento-2.4.0.js +8 -10
  56. package/lib/config/versions/magento-2.4.1-p1.js +8 -10
  57. package/lib/config/versions/magento-2.4.1.js +8 -10
  58. package/lib/config/versions/magento-2.4.2-p1.js +8 -10
  59. package/lib/config/versions/magento-2.4.2-p2.js +8 -10
  60. package/lib/config/versions/magento-2.4.2.js +8 -10
  61. package/lib/config/versions/magento-2.4.3-p1.js +8 -10
  62. package/lib/config/versions/magento-2.4.3-p2.js +8 -10
  63. package/lib/config/versions/magento-2.4.3-p3.js +8 -10
  64. package/lib/config/versions/magento-2.4.3.js +8 -10
  65. package/lib/config/versions/magento-2.4.4-p1.js +8 -10
  66. package/lib/config/versions/magento-2.4.4.js +8 -10
  67. package/lib/config/versions/magento-2.4.5.js +8 -10
  68. package/lib/tasks/cli/create-bashrc-config.js +4 -2
  69. package/lib/tasks/composer/local-auth-json.js +1 -1
  70. package/lib/tasks/database/connect-to-database.js +6 -3
  71. package/lib/tasks/database/create-magento-database.js +5 -2
  72. package/lib/tasks/database/create-magento-user.js +50 -0
  73. package/lib/tasks/database/default-magento-database.js +3 -0
  74. package/lib/tasks/database/default-magento-user.js +7 -0
  75. package/lib/tasks/database/import-dump-to-database.js +3 -2
  76. package/lib/tasks/docker/api.d.ts +25 -1
  77. package/lib/tasks/docker/api.js +31 -1
  78. package/lib/tasks/docker/containers/container-api.d.ts +21 -0
  79. package/lib/tasks/docker/containers/container-api.js +82 -17
  80. package/lib/tasks/docker/containers/tasks.js +44 -13
  81. package/lib/tasks/docker/convert-composer-home-to-composer-cache-volume.js +52 -0
  82. package/lib/tasks/docker/convert-mysql-to-mariadb.js +2 -2
  83. package/lib/tasks/docker/image/image-api.d.ts +44 -0
  84. package/lib/tasks/docker/image/image-api.js +30 -2
  85. package/lib/tasks/docker/index.js +6 -1
  86. package/lib/tasks/docker/project-image-builder.js +37 -14
  87. package/lib/tasks/docker/system/index.js +5 -0
  88. package/lib/tasks/docker/system/system-api.d.ts +71 -0
  89. package/lib/tasks/docker/system/system-api.js +29 -0
  90. package/lib/tasks/docker/volume/index.js +2 -1
  91. package/lib/tasks/docker/volume/tasks.js +67 -9
  92. package/lib/tasks/docker/volume/volume-api.d.ts +40 -0
  93. package/lib/tasks/docker/volume/volume-api.js +54 -1
  94. package/lib/tasks/execute.js +11 -9
  95. package/lib/tasks/file-system/create-nginx-config.js +3 -5
  96. package/lib/tasks/file-system/create-php-config.js +2 -23
  97. package/lib/tasks/file-system/create-php-debug-config.js +45 -0
  98. package/lib/tasks/file-system/create-php-fpm-config.js +2 -4
  99. package/lib/tasks/file-system/create-phpstorm-config/exclude-folder-config.js +13 -3
  100. package/lib/tasks/file-system/create-phpstorm-config/index.js +2 -1
  101. package/lib/tasks/file-system/create-ssl-terminator-config.js +23 -8
  102. package/lib/tasks/file-system/create-varnish-config.js +4 -7
  103. package/lib/tasks/file-system/create-vscode-config.js +2 -1
  104. package/lib/tasks/file-system/index.js +3 -2
  105. package/lib/tasks/magento/setup-magento/configure-elasticsearch.js +2 -4
  106. package/lib/tasks/magento/setup-magento/flush-redis-config.js +3 -6
  107. package/lib/tasks/magento/setup-magento/index.js +2 -0
  108. package/lib/tasks/magento/setup-magento/install-magento.js +8 -13
  109. package/lib/tasks/magento/setup-magento/set-base-url.js +2 -1
  110. package/lib/tasks/magento/setup-magento/set-mail-config.js +22 -0
  111. package/lib/tasks/magento/setup-magento/varnish-config.js +4 -9
  112. package/lib/tasks/magento/setup-magento/waiting-for-varnish.js +15 -16
  113. package/lib/tasks/php/php-container.js +1 -1
  114. package/lib/tasks/php/update-env-php.js +3 -5
  115. package/lib/tasks/{prefix → project-config}/index.js +6 -6
  116. package/lib/tasks/requirements/composer-credentials.js +7 -3
  117. package/lib/tasks/requirements/docker/context.js +88 -0
  118. package/lib/tasks/requirements/docker/index.js +111 -19
  119. package/lib/tasks/requirements/docker/install.js +21 -7
  120. package/lib/tasks/requirements/docker/permissions.js +2 -11
  121. package/lib/tasks/requirements/docker/running-status.js +94 -24
  122. package/lib/tasks/requirements/docker/version.js +1 -0
  123. package/lib/tasks/requirements/index.js +0 -2
  124. package/lib/tasks/requirements/php-version.js +4 -2
  125. package/lib/tasks/start.js +27 -8
  126. package/lib/tasks/status/index.js +60 -21
  127. package/lib/tasks/stop.js +2 -0
  128. package/lib/tasks/theme/retrieve-theme-data.js +12 -2
  129. package/lib/util/config-file-validator.js +17 -3
  130. package/lib/util/execute-in-container.js +35 -5
  131. package/lib/util/instance-metadata.js +14 -2
  132. package/lib/util/systemctl.js +62 -13
  133. package/package.json +2 -2
  134. package/typings/context.d.ts +11 -0
  135. package/typings/index.d.ts +46 -1
  136. package/lib/tasks/requirements/dependency/arch.js +0 -50
  137. package/lib/tasks/requirements/dependency/centos.js +0 -36
  138. package/lib/tasks/requirements/dependency/fedora.js +0 -36
  139. package/lib/tasks/requirements/dependency/index.js +0 -33
  140. package/lib/tasks/requirements/dependency/mac.js +0 -124
  141. package/lib/tasks/requirements/dependency/ubuntu.js +0 -83
package/lib/config/versions/magento-2.3.7-p3.js CHANGED
@@ -1,9 +1,11 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
4
3
  const { repo } = require('../php/base-repo');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer2 } = require('../services/composer/versions');
6
+ const { maildev } = require('../services/maildev');
7
+ const { nginx118 } = require('../services/nginx/versions');
8
+ const { sslTerminator } = require('../services/ssl-terminator');
7
9
  const { varnish66 } = require('../varnish/varnish-6-6');
8
10
 
9
11
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
14
16
  extensions: magento23PHPExtensionList,
15
17
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
18
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
19
+ nginx: nginx118({ templateDir }),
21
20
  redis: {
22
21
  version: '6'
23
22
  },
@@ -30,11 +29,10 @@ module.exports = ({ templateDir } = {}) => ({
30
29
  elasticsearch: {
31
30
  version: '7.9.3'
32
31
  },
33
- composer: {
34
- version: '2'
35
- },
32
+ composer: composer2(),
36
33
  varnish: varnish66({ templateDir }),
37
- sslTerminator: sslTerminator({ templateDir })
34
+ sslTerminator: sslTerminator({ templateDir }),
35
+ maildev: maildev()
38
36
  },
39
37
  magento: defaultMagentoConfig,
40
38
  host: 'localhost',
package/lib/config/versions/magento-2.3.7-p4.js CHANGED
@@ -1,9 +1,11 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
4
3
  const { repo } = require('../php/base-repo');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer2 } = require('../services/composer/versions');
6
+ const { maildev } = require('../services/maildev');
7
+ const { nginx118 } = require('../services/nginx/versions');
8
+ const { sslTerminator } = require('../services/ssl-terminator');
7
9
  const { varnish66 } = require('../varnish/varnish-6-6');
8
10
 
9
11
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
14
16
  extensions: magento23PHPExtensionList,
15
17
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
18
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
19
+ nginx: nginx118({ templateDir }),
21
20
  redis: {
22
21
  version: '6'
23
22
  },
@@ -30,11 +29,10 @@ module.exports = ({ templateDir } = {}) => ({
30
29
  elasticsearch: {
31
30
  version: '7.9.3'
32
31
  },
33
- composer: {
34
- version: '2'
35
- },
32
+ composer: composer2(),
36
33
  varnish: varnish66({ templateDir }),
37
- sslTerminator: sslTerminator({ templateDir })
34
+ sslTerminator: sslTerminator({ templateDir }),
35
+ maildev: maildev()
38
36
  },
39
37
  magento: defaultMagentoConfig,
40
38
  host: 'localhost',
package/lib/config/versions/magento-2.3.7.js CHANGED
@@ -1,9 +1,11 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
4
3
  const { repo } = require('../php/base-repo');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer2 } = require('../services/composer/versions');
6
+ const { maildev } = require('../services/maildev');
7
+ const { nginx118 } = require('../services/nginx/versions');
8
+ const { sslTerminator } = require('../services/ssl-terminator');
7
9
  const { varnish66 } = require('../varnish/varnish-6-6');
8
10
 
9
11
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
14
16
  extensions: magento23PHPExtensionList,
15
17
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
18
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
19
+ nginx: nginx118({ templateDir }),
21
20
  redis: {
22
21
  version: '6'
23
22
  },
@@ -30,11 +29,10 @@ module.exports = ({ templateDir } = {}) => ({
30
29
  elasticsearch: {
31
30
  version: '7.9.3'
32
31
  },
33
- composer: {
34
- version: '2'
35
- },
32
+ composer: composer2(),
36
33
  varnish: varnish66({ templateDir }),
37
- sslTerminator: sslTerminator({ templateDir })
34
+ sslTerminator: sslTerminator({ templateDir }),
35
+ maildev: maildev()
38
36
  },
39
37
  magento: defaultMagentoConfig,
40
38
  host: 'localhost',
package/lib/config/versions/magento-2.4.0-p1.js CHANGED
@@ -1,9 +1,11 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
4
3
  const { repo } = require('../php/base-repo');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { maildev } = require('../services/maildev');
7
+ const { nginx118 } = require('../services/nginx/versions');
8
+ const { sslTerminator } = require('../services/ssl-terminator');
7
9
  const { varnish60 } = require('../varnish/varnish-6-0');
8
10
 
9
11
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
14
16
  extensions: magento24PHPExtensionList,
15
17
  baseImage: `${ repo }:php-7.4-magento-2.4`
16
18
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
19
+ nginx: nginx118({ templateDir }),
21
20
  redis: {
22
21
  version: '5'
23
22
  },
@@ -30,11 +29,10 @@ module.exports = ({ templateDir } = {}) => ({
30
29
  elasticsearch: {
31
30
  version: '7.12.1'
32
31
  },
33
- composer: {
34
- version: '1'
35
- },
32
+ composer: composer1(),
36
33
  varnish: varnish60({ templateDir }),
37
- sslTerminator: sslTerminator({ templateDir })
34
+ sslTerminator: sslTerminator({ templateDir }),
35
+ maildev: maildev()
38
36
  },
39
37
  magento: defaultMagentoConfig,
40
38
  host: 'localhost',
package/lib/config/versions/magento-2.4.0.js CHANGED
@@ -1,9 +1,11 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
4
3
  const { repo } = require('../php/base-repo');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { maildev } = require('../services/maildev');
7
+ const { nginx118 } = require('../services/nginx/versions');
8
+ const { sslTerminator } = require('../services/ssl-terminator');
7
9
  const { varnish60 } = require('../varnish/varnish-6-0');
8
10
 
9
11
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
14
16
  extensions: magento24PHPExtensionList,
15
17
  baseImage: `${ repo }:php-7.4-magento-2.4`
16
18
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
19
+ nginx: nginx118({ templateDir }),
21
20
  redis: {
22
21
  version: '5'
23
22
  },
@@ -30,11 +29,10 @@ module.exports = ({ templateDir } = {}) => ({
30
29
  elasticsearch: {
31
30
  version: '7.12.1'
32
31
  },
33
- composer: {
34
- version: '1'
35
- },
32
+ composer: composer1(),
36
33
  varnish: varnish60({ templateDir }),
37
- sslTerminator: sslTerminator({ templateDir })
34
+ sslTerminator: sslTerminator({ templateDir }),
35
+ maildev: maildev()
38
36
  },
39
37
  magento: defaultMagentoConfig,
40
38
  host: 'localhost',
package/lib/config/versions/magento-2.4.1-p1.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer1 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.1-p1',
@@ -15,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
15
17
  extensions: { ...magento24PHPExtensionList, sodium },
16
18
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
19
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
20
+ nginx: nginx118({ templateDir }),
22
21
  redis: {
23
22
  version: '6.0.10-alpine'
24
23
  },
@@ -31,11 +30,10 @@ module.exports = ({ templateDir } = {}) => ({
31
30
  elasticsearch: {
32
31
  version: '7.12.1'
33
32
  },
34
- composer: {
35
- version: '1'
36
- },
33
+ composer: composer1(),
37
34
  varnish: varnish66({ templateDir }),
38
- sslTerminator: sslTerminator({ templateDir })
35
+ sslTerminator: sslTerminator({ templateDir }),
36
+ maildev: maildev()
39
37
  },
40
38
  magento: defaultMagentoConfig,
41
39
  host: 'localhost',
package/lib/config/versions/magento-2.4.1.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer1 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.1',
@@ -15,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
15
17
  extensions: { ...magento24PHPExtensionList, sodium },
16
18
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
19
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
20
+ nginx: nginx118({ templateDir }),
22
21
  redis: {
23
22
  version: '6.0.10-alpine'
24
23
  },
@@ -31,11 +30,10 @@ module.exports = ({ templateDir } = {}) => ({
31
30
  elasticsearch: {
32
31
  version: '7.12.1'
33
32
  },
34
- composer: {
35
- version: '1'
36
- },
33
+ composer: composer1(),
37
34
  varnish: varnish66({ templateDir }),
38
- sslTerminator: sslTerminator({ templateDir })
35
+ sslTerminator: sslTerminator({ templateDir }),
36
+ maildev: maildev()
39
37
  },
40
38
  magento: defaultMagentoConfig,
41
39
  host: 'localhost',
package/lib/config/versions/magento-2.4.2-p1.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.2-p1',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.12.1'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.2-p2.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.2-p2',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.12.1'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.2.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.2',
@@ -15,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
15
17
  extensions: { ...magento24PHPExtensionList, sodium },
16
18
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
19
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
20
+ nginx: nginx118({ templateDir }),
22
21
  redis: {
23
22
  version: '6.0'
24
23
  },
@@ -31,11 +30,10 @@ module.exports = ({ templateDir } = {}) => ({
31
30
  elasticsearch: {
32
31
  version: '7.12.1'
33
32
  },
34
- composer: {
35
- version: '2'
36
- },
33
+ composer: composer2(),
37
34
  varnish: varnish66({ templateDir }),
38
- sslTerminator: sslTerminator({ templateDir })
35
+ sslTerminator: sslTerminator({ templateDir }),
36
+ maildev: maildev()
39
37
  },
40
38
  magento: defaultMagentoConfig,
41
39
  host: 'localhost',
package/lib/config/versions/magento-2.4.3-p1.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.3-p1',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.16.3'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.3-p2.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.3-p2',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.16.3'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.3-p3.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.3-p3',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.16.3'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.3.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php74 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish66 } = require('../varnish/varnish-6-6');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.3',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.16.3'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish66({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',
package/lib/config/versions/magento-2.4.4-p1.js CHANGED
@@ -1,11 +1,13 @@
1
- const path = require('path');
2
1
  const { defaultMagentoConfig } = require('../magento-config');
3
2
  const sodium = require('../php/extensions/sodium');
4
3
  const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { php81 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { sslTerminator } = require('../services/ssl-terminator');
7
6
  const { varnish70 } = require('../varnish/varnish-7-0');
8
7
  const { repo } = require('../php/base-repo');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer2 } = require('../services/composer/versions');
10
+ const { maildev } = require('../services/maildev');
9
11
 
10
12
  module.exports = ({ templateDir } = {}) => ({
11
13
  magentoVersion: '2.4.4-p1',
@@ -16,10 +18,7 @@ module.exports = ({ templateDir } = {}) => ({
16
18
  extensions: { ...magento24PHPExtensionList, sodium },
17
19
  baseImage: `${ repo }:php-8.1-magento-2.4`
18
20
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
21
+ nginx: nginx118({ templateDir }),
23
22
  redis: {
24
23
  version: '6.0'
25
24
  },
@@ -32,11 +31,10 @@ module.exports = ({ templateDir } = {}) => ({
32
31
  elasticsearch: {
33
32
  version: '7.16.3'
34
33
  },
35
- composer: {
36
- version: '2'
37
- },
34
+ composer: composer2(),
38
35
  varnish: varnish70({ templateDir }),
39
- sslTerminator: sslTerminator({ templateDir })
36
+ sslTerminator: sslTerminator({ templateDir }),
37
+ maildev: maildev()
40
38
  },
41
39
  magento: defaultMagentoConfig,
42
40
  host: 'localhost',