@scandipwa/magento-scripts 2.0.0-alpha.10 → 2.0.0-alpha.13

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 (117) hide show
  1. package/lib/commands/cli.js +5 -0
  2. package/lib/commands/start.js +17 -3
  3. package/lib/commands/status.js +9 -1
  4. package/lib/config/config.js +20 -2
  5. package/lib/config/docker.js +43 -44
  6. package/lib/config/index.js +1 -1
  7. package/lib/config/php/versions/php-7.2.js +1 -0
  8. package/lib/config/php/versions/php-7.3.js +1 -0
  9. package/lib/config/php/versions/php-7.4.js +1 -0
  10. package/lib/config/php/versions/php-8.1.js +1 -0
  11. package/lib/config/php-config.js +4 -3
  12. package/lib/config/services/composer/versions/composer-1.js +8 -0
  13. package/lib/config/services/composer/versions/composer-2.js +8 -0
  14. package/lib/config/services/composer/versions/index.js +4 -0
  15. package/lib/config/services/nginx/versions/index.js +3 -0
  16. package/lib/config/services/nginx/versions/nginx-1.18.js +11 -0
  17. package/lib/config/{ssl-terminator → services/ssl-terminator}/index.js +3 -0
  18. package/lib/config/templates/magentorc.template +6 -5
  19. package/lib/config/templates/php-debug.template.ini +31 -0
  20. package/lib/config/templates/php-fpm.template.conf +1 -2
  21. package/lib/config/templates/php.template.ini +5 -201
  22. package/lib/config/templates/ssl-terminator.template.conf +2 -0
  23. package/lib/config/templates/varnish.template.vcl +20 -13
  24. package/lib/config/varnish/varnish-6-0.js +4 -0
  25. package/lib/config/varnish/varnish-6-6.js +4 -0
  26. package/lib/config/varnish/varnish-7-0.js +4 -0
  27. package/lib/config/versions/magento-2.3.0.js +5 -9
  28. package/lib/config/versions/magento-2.3.1.js +5 -9
  29. package/lib/config/versions/magento-2.3.2-p1.js +5 -9
  30. package/lib/config/versions/magento-2.3.2-p2.js +5 -9
  31. package/lib/config/versions/magento-2.3.2.js +5 -9
  32. package/lib/config/versions/magento-2.3.3-p1.js +5 -9
  33. package/lib/config/versions/magento-2.3.3.js +5 -9
  34. package/lib/config/versions/magento-2.3.4-p1.js +5 -9
  35. package/lib/config/versions/magento-2.3.4-p2.js +5 -9
  36. package/lib/config/versions/magento-2.3.4.js +5 -9
  37. package/lib/config/versions/magento-2.3.5-p1.js +5 -9
  38. package/lib/config/versions/magento-2.3.5-p2.js +5 -9
  39. package/lib/config/versions/magento-2.3.5.js +5 -9
  40. package/lib/config/versions/magento-2.3.6-p1.js +5 -9
  41. package/lib/config/versions/magento-2.3.6.js +5 -9
  42. package/lib/config/versions/magento-2.3.7-p1.js +5 -9
  43. package/lib/config/versions/magento-2.3.7-p2.js +5 -9
  44. package/lib/config/versions/magento-2.3.7-p3.js +5 -9
  45. package/lib/config/versions/magento-2.3.7-p4.js +5 -9
  46. package/lib/config/versions/magento-2.3.7.js +5 -9
  47. package/lib/config/versions/magento-2.4.0-p1.js +5 -9
  48. package/lib/config/versions/magento-2.4.0.js +5 -9
  49. package/lib/config/versions/magento-2.4.1-p1.js +5 -9
  50. package/lib/config/versions/magento-2.4.1.js +5 -9
  51. package/lib/config/versions/magento-2.4.2-p1.js +5 -9
  52. package/lib/config/versions/magento-2.4.2-p2.js +5 -9
  53. package/lib/config/versions/magento-2.4.2.js +5 -9
  54. package/lib/config/versions/magento-2.4.3-p1.js +5 -9
  55. package/lib/config/versions/magento-2.4.3-p2.js +5 -9
  56. package/lib/config/versions/magento-2.4.3-p3.js +5 -9
  57. package/lib/config/versions/magento-2.4.3.js +5 -9
  58. package/lib/config/versions/magento-2.4.4-p1.js +5 -9
  59. package/lib/config/versions/magento-2.4.4.js +5 -9
  60. package/lib/config/versions/magento-2.4.5.js +5 -9
  61. package/lib/tasks/composer/local-auth-json.js +1 -1
  62. package/lib/tasks/database/connect-to-database.js +6 -3
  63. package/lib/tasks/database/create-magento-database.js +5 -2
  64. package/lib/tasks/database/create-magento-user.js +50 -0
  65. package/lib/tasks/database/default-magento-database.js +3 -0
  66. package/lib/tasks/database/default-magento-user.js +7 -0
  67. package/lib/tasks/database/import-dump-to-database.js +3 -2
  68. package/lib/tasks/docker/api.d.ts +25 -1
  69. package/lib/tasks/docker/api.js +31 -1
  70. package/lib/tasks/docker/containers/container-api.d.ts +14 -0
  71. package/lib/tasks/docker/containers/container-api.js +50 -1
  72. package/lib/tasks/docker/containers/tasks.js +32 -1
  73. package/lib/tasks/docker/index.js +6 -1
  74. package/lib/tasks/docker/project-image-builder.js +6 -8
  75. package/lib/tasks/docker/volume/index.js +2 -1
  76. package/lib/tasks/docker/volume/tasks.js +54 -9
  77. package/lib/tasks/docker/volume/volume-api.d.ts +10 -0
  78. package/lib/tasks/docker/volume/volume-api.js +25 -1
  79. package/lib/tasks/execute.js +5 -2
  80. package/lib/tasks/file-system/create-nginx-config.js +3 -5
  81. package/lib/tasks/file-system/create-php-config.js +2 -23
  82. package/lib/tasks/file-system/create-php-debug-config.js +45 -0
  83. package/lib/tasks/file-system/create-php-fpm-config.js +2 -4
  84. package/lib/tasks/file-system/create-ssl-terminator-config.js +4 -7
  85. package/lib/tasks/file-system/create-varnish-config.js +4 -7
  86. package/lib/tasks/file-system/index.js +2 -0
  87. package/lib/tasks/magento/setup-magento/configure-elasticsearch.js +2 -4
  88. package/lib/tasks/magento/setup-magento/flush-redis-config.js +3 -6
  89. package/lib/tasks/magento/setup-magento/install-magento.js +8 -10
  90. package/lib/tasks/magento/setup-magento/varnish-config.js +4 -9
  91. package/lib/tasks/magento/setup-magento/waiting-for-varnish.js +15 -16
  92. package/lib/tasks/php/php-container.js +1 -1
  93. package/lib/tasks/php/update-env-php.js +3 -4
  94. package/lib/tasks/requirements/composer-credentials.js +7 -3
  95. package/lib/tasks/requirements/docker/context.js +88 -0
  96. package/lib/tasks/requirements/docker/index.js +107 -18
  97. package/lib/tasks/requirements/docker/install.js +21 -7
  98. package/lib/tasks/requirements/docker/permissions.js +2 -11
  99. package/lib/tasks/requirements/docker/running-status.js +94 -24
  100. package/lib/tasks/requirements/docker/version.js +1 -0
  101. package/lib/tasks/requirements/index.js +0 -2
  102. package/lib/tasks/requirements/php-version.js +4 -2
  103. package/lib/tasks/start.js +27 -6
  104. package/lib/tasks/status/index.js +13 -11
  105. package/lib/tasks/stop.js +2 -0
  106. package/lib/util/config-file-validator.js +2 -0
  107. package/lib/util/execute-in-container.js +3 -3
  108. package/lib/util/systemctl.js +62 -13
  109. package/package.json +2 -2
  110. package/typings/context.d.ts +7 -0
  111. package/typings/index.d.ts +38 -1
  112. package/lib/tasks/requirements/dependency/arch.js +0 -50
  113. package/lib/tasks/requirements/dependency/centos.js +0 -36
  114. package/lib/tasks/requirements/dependency/fedora.js +0 -36
  115. package/lib/tasks/requirements/dependency/index.js +0 -33
  116. package/lib/tasks/requirements/dependency/mac.js +0 -124
  117. package/lib/tasks/requirements/dependency/ubuntu.js +0 -83
package/lib/config/versions/magento-2.3.4.js CHANGED
@@ -1,11 +1,12 @@
1
- const path = require('path');
2
1
  const { elasticsearch68 } = require('../services/elasticsearch/versions');
3
2
  const { defaultMagentoConfig } = require('../magento-config');
4
3
  const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
5
4
  const { repo } = require('../php/base-repo');
6
5
  const { php73 } = require('../php/versions');
7
- const { sslTerminator } = require('../ssl-terminator');
6
+ const { sslTerminator } = require('../services/ssl-terminator');
8
7
  const { varnish66 } = require('../varnish/varnish-6-6');
8
+ const { nginx118 } = require('../services/nginx/versions');
9
+ const { composer1 } = require('../services/composer/versions');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.3.4',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
15
16
  extensions: magento23PHPExtensionList,
16
17
  baseImage: `${ repo }:php-7.3-magento-2.3`
17
18
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
19
+ nginx: nginx118({ templateDir }),
22
20
  redis: {
23
21
  version: '5'
24
22
  },
@@ -29,9 +27,7 @@ module.exports = ({ templateDir } = {}) => ({
29
27
  version: '10.2'
30
28
  },
31
29
  elasticsearch: elasticsearch68(),
32
- composer: {
33
- version: '1'
34
- },
30
+ composer: composer1(),
35
31
  varnish: varnish66({ templateDir }),
36
32
  sslTerminator: sslTerminator({ templateDir })
37
33
  },
package/lib/config/versions/magento-2.3.5-p1.js CHANGED
@@ -1,9 +1,10 @@
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 { php73 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.3-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.6.2'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.5-p2.js CHANGED
@@ -1,9 +1,10 @@
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 { php73 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.3-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.6.2'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.5.js CHANGED
@@ -1,9 +1,10 @@
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 { php73 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.3-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.6.2'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.6-p1.js CHANGED
@@ -1,9 +1,10 @@
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 { php73 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.3-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.7.1'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.6.js CHANGED
@@ -1,9 +1,10 @@
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 { php73 } = require('../php/versions');
6
- const { sslTerminator } = require('../ssl-terminator');
5
+ const { composer1 } = require('../services/composer/versions');
6
+ const { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.3-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.7.1'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.7-p1.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '6'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.9.3'
32
30
  },
33
- composer: {
34
- version: '2'
35
- },
31
+ composer: composer2(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.7-p2.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '6'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.9.3'
32
30
  },
33
- composer: {
34
- version: '2'
35
- },
31
+ composer: composer2(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.7-p3.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '6'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.9.3'
32
30
  },
33
- composer: {
34
- version: '2'
35
- },
31
+ composer: composer2(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.7-p4.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '6'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.9.3'
32
30
  },
33
- composer: {
34
- version: '2'
35
- },
31
+ composer: composer2(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.3.7.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish66 } = require('../varnish/varnish-6-6');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento23PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.3`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '6'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.9.3'
32
30
  },
33
- composer: {
34
- version: '2'
35
- },
31
+ composer: composer2(),
36
32
  varnish: varnish66({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.4.0-p1.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish60 } = require('../varnish/varnish-6-0');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento24PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.4`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.12.1'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish60({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.4.0.js CHANGED
@@ -1,9 +1,10 @@
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 { nginx118 } = require('../services/nginx/versions');
7
+ const { sslTerminator } = require('../services/ssl-terminator');
7
8
  const { varnish60 } = require('../varnish/varnish-6-0');
8
9
 
9
10
  module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
14
15
  extensions: magento24PHPExtensionList,
15
16
  baseImage: `${ repo }:php-7.4-magento-2.4`
16
17
  }),
17
- nginx: {
18
- version: '1.18.0',
19
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
20
- },
18
+ nginx: nginx118({ templateDir }),
21
19
  redis: {
22
20
  version: '5'
23
21
  },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
30
28
  elasticsearch: {
31
29
  version: '7.12.1'
32
30
  },
33
- composer: {
34
- version: '1'
35
- },
31
+ composer: composer1(),
36
32
  varnish: varnish60({ templateDir }),
37
33
  sslTerminator: sslTerminator({ templateDir })
38
34
  },
package/lib/config/versions/magento-2.4.1-p1.js CHANGED
@@ -1,11 +1,12 @@
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');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.4.1-p1',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
15
16
  extensions: { ...magento24PHPExtensionList, sodium },
16
17
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
18
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
19
+ nginx: nginx118({ templateDir }),
22
20
  redis: {
23
21
  version: '6.0.10-alpine'
24
22
  },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
31
29
  elasticsearch: {
32
30
  version: '7.12.1'
33
31
  },
34
- composer: {
35
- version: '1'
36
- },
32
+ composer: composer1(),
37
33
  varnish: varnish66({ templateDir }),
38
34
  sslTerminator: sslTerminator({ templateDir })
39
35
  },
package/lib/config/versions/magento-2.4.1.js CHANGED
@@ -1,11 +1,12 @@
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');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.4.1',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
15
16
  extensions: { ...magento24PHPExtensionList, sodium },
16
17
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
18
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
19
+ nginx: nginx118({ templateDir }),
22
20
  redis: {
23
21
  version: '6.0.10-alpine'
24
22
  },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
31
29
  elasticsearch: {
32
30
  version: '7.12.1'
33
31
  },
34
- composer: {
35
- version: '1'
36
- },
32
+ composer: composer1(),
37
33
  varnish: varnish66({ templateDir }),
38
34
  sslTerminator: sslTerminator({ templateDir })
39
35
  },
package/lib/config/versions/magento-2.4.2-p1.js CHANGED
@@ -1,11 +1,12 @@
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');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.4.2-p1',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
16
17
  extensions: { ...magento24PHPExtensionList, sodium },
17
18
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
19
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
20
+ nginx: nginx118({ templateDir }),
23
21
  redis: {
24
22
  version: '6.0'
25
23
  },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
32
30
  elasticsearch: {
33
31
  version: '7.12.1'
34
32
  },
35
- composer: {
36
- version: '2'
37
- },
33
+ composer: composer2(),
38
34
  varnish: varnish66({ templateDir }),
39
35
  sslTerminator: sslTerminator({ templateDir })
40
36
  },
package/lib/config/versions/magento-2.4.2-p2.js CHANGED
@@ -1,11 +1,12 @@
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');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.4.2-p2',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
16
17
  extensions: { ...magento24PHPExtensionList, sodium },
17
18
  baseImage: `${ repo }:php-7.4-magento-2.4`
18
19
  }),
19
- nginx: {
20
- version: '1.18.0',
21
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
22
- },
20
+ nginx: nginx118({ templateDir }),
23
21
  redis: {
24
22
  version: '6.0'
25
23
  },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
32
30
  elasticsearch: {
33
31
  version: '7.12.1'
34
32
  },
35
- composer: {
36
- version: '2'
37
- },
33
+ composer: composer2(),
38
34
  varnish: varnish66({ templateDir }),
39
35
  sslTerminator: sslTerminator({ templateDir })
40
36
  },
package/lib/config/versions/magento-2.4.2.js CHANGED
@@ -1,11 +1,12 @@
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');
9
10
 
10
11
  module.exports = ({ templateDir } = {}) => ({
11
12
  magentoVersion: '2.4.2',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
15
16
  extensions: { ...magento24PHPExtensionList, sodium },
16
17
  baseImage: `${ repo }:php-7.4-magento-2.4`
17
18
  }),
18
- nginx: {
19
- version: '1.18.0',
20
- configTemplate: path.join(templateDir || '', 'nginx.template.conf')
21
- },
19
+ nginx: nginx118({ templateDir }),
22
20
  redis: {
23
21
  version: '6.0'
24
22
  },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
31
29
  elasticsearch: {
32
30
  version: '7.12.1'
33
31
  },
34
- composer: {
35
- version: '2'
36
- },
32
+ composer: composer2(),
37
33
  varnish: varnish66({ templateDir }),
38
34
  sslTerminator: sslTerminator({ templateDir })
39
35
  },