@scandipwa/magento-scripts 2.0.3-alpha.0 → 2.0.4

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 (347) hide show
  1. package/.eslintrc +6 -1
  2. package/exec.js +75 -39
  3. package/index.js +87 -46
  4. package/lib/commands/cleanup.js +18 -21
  5. package/lib/commands/cli.js +138 -73
  6. package/lib/commands/execute.js +5 -5
  7. package/lib/commands/import-db.js +21 -24
  8. package/lib/commands/link.js +17 -20
  9. package/lib/commands/logs.js +91 -91
  10. package/lib/commands/start.js +229 -191
  11. package/lib/commands/status.js +64 -50
  12. package/lib/commands/stop.js +14 -11
  13. package/lib/config/check-configuration-file.js +33 -28
  14. package/lib/config/cma-config.js +4 -4
  15. package/lib/config/config.js +40 -18
  16. package/lib/config/dependencies-for-platforms.js +33 -3
  17. package/lib/config/docker.js +258 -173
  18. package/lib/config/get-magento-version-config.js +45 -38
  19. package/lib/config/get-port-config.js +30 -44
  20. package/lib/config/get-project-configuration.js +8 -8
  21. package/lib/config/index.js +51 -42
  22. package/lib/config/magento/required-php-extensions/index.js +33 -19
  23. package/lib/config/magento/required-php-extensions/magento-2.3.js +2 -2
  24. package/lib/config/magento/required-php-extensions/magento-2.4.js +2 -2
  25. package/lib/config/magento-config.js +4 -4
  26. package/lib/config/php-config.js +8 -6
  27. package/lib/config/port-config.js +62 -43
  28. package/lib/config/save-config.js +6 -6
  29. package/lib/config/scandipwa-versions.js +2 -2
  30. package/lib/config/services/composer/versions/composer-1.js +2 -2
  31. package/lib/config/services/composer/versions/composer-2.js +2 -2
  32. package/lib/config/services/composer/versions/index.js +1 -1
  33. package/lib/config/services/elasticsearch/base-repo.js +1 -1
  34. package/lib/config/services/elasticsearch/default-es-env.js +4 -1
  35. package/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js +17 -14
  36. package/lib/config/services/elasticsearch/versions/elasticsearch-7.10.js +4 -4
  37. package/lib/config/services/elasticsearch/versions/elasticsearch-7.12.js +4 -4
  38. package/lib/config/services/elasticsearch/versions/elasticsearch-7.16.js +4 -4
  39. package/lib/config/services/elasticsearch/versions/elasticsearch-7.17.js +4 -4
  40. package/lib/config/services/elasticsearch/versions/elasticsearch-7.6.js +4 -4
  41. package/lib/config/services/elasticsearch/versions/elasticsearch-7.7.js +4 -4
  42. package/lib/config/services/elasticsearch/versions/elasticsearch-7.9.js +4 -4
  43. package/lib/config/services/elasticsearch/versions/index.js +9 -9
  44. package/lib/config/services/maildev/index.js +5 -2
  45. package/lib/config/services/mariadb/versions/index.js +1 -1
  46. package/lib/config/services/mariadb/versions/mariadb-10.2.js +3 -3
  47. package/lib/config/services/mariadb/versions/mariadb-10.3.js +3 -3
  48. package/lib/config/services/mariadb/versions/mariadb-10.4.js +3 -3
  49. package/lib/config/services/nginx/versions/index.js +1 -1
  50. package/lib/config/services/nginx/versions/nginx-1.18.js +5 -4
  51. package/lib/config/services/php/base-repo.js +1 -1
  52. package/lib/config/services/php/extensions/apcu.js +3 -3
  53. package/lib/config/services/php/extensions/bcmath.js +2 -2
  54. package/lib/config/services/php/extensions/curl.js +3 -6
  55. package/lib/config/services/php/extensions/gd.js +4 -3
  56. package/lib/config/services/php/extensions/index.js +9 -8
  57. package/lib/config/services/php/extensions/intl.js +3 -5
  58. package/lib/config/services/php/extensions/opcache.js +3 -5
  59. package/lib/config/services/php/extensions/pdo_mysql.js +2 -2
  60. package/lib/config/services/php/extensions/soap.js +3 -5
  61. package/lib/config/services/php/extensions/sodium.js +3 -5
  62. package/lib/config/services/php/extensions/xdebug.js +5 -3
  63. package/lib/config/services/php/extensions/xsl.js +3 -5
  64. package/lib/config/services/php/extensions/zip.js +3 -5
  65. package/lib/config/services/php/versions/index.js +1 -1
  66. package/lib/config/services/php/versions/php-7.2.js +13 -9
  67. package/lib/config/services/php/versions/php-7.3.js +13 -9
  68. package/lib/config/services/php/versions/php-7.4.js +13 -9
  69. package/lib/config/services/php/versions/php-8.1.js +13 -9
  70. package/lib/config/services/redis/index.js +1 -1
  71. package/lib/config/services/redis/redis-5.0.js +2 -2
  72. package/lib/config/services/redis/redis-6.0.js +2 -2
  73. package/lib/config/services/redis/redis-6.2.js +2 -2
  74. package/lib/config/services/ssl-terminator/index.js +6 -5
  75. package/lib/config/services/varnish/index.js +1 -1
  76. package/lib/config/services/varnish/varnish-6-0.js +7 -5
  77. package/lib/config/services/varnish/varnish-6-6.js +7 -5
  78. package/lib/config/services/varnish/varnish-7-0.js +7 -5
  79. package/lib/config/system-config.js +55 -32
  80. package/lib/config/templates/mariadb.template.cnf +2 -0
  81. package/lib/config/versions/index.js +49 -34
  82. package/lib/config/versions/magento-2.2.10.js +22 -15
  83. package/lib/config/versions/magento-2.3.0.js +22 -15
  84. package/lib/config/versions/magento-2.3.1.js +22 -15
  85. package/lib/config/versions/magento-2.3.2-p1.js +22 -15
  86. package/lib/config/versions/magento-2.3.2-p2.js +22 -15
  87. package/lib/config/versions/magento-2.3.2.js +22 -15
  88. package/lib/config/versions/magento-2.3.3-p1.js +22 -15
  89. package/lib/config/versions/magento-2.3.3.js +22 -15
  90. package/lib/config/versions/magento-2.3.4-p1.js +22 -15
  91. package/lib/config/versions/magento-2.3.4-p2.js +22 -15
  92. package/lib/config/versions/magento-2.3.4.js +22 -15
  93. package/lib/config/versions/magento-2.3.5-p1.js +22 -15
  94. package/lib/config/versions/magento-2.3.5-p2.js +22 -15
  95. package/lib/config/versions/magento-2.3.5.js +27 -15
  96. package/lib/config/versions/magento-2.3.6-p1.js +22 -15
  97. package/lib/config/versions/magento-2.3.6.js +22 -15
  98. package/lib/config/versions/magento-2.3.7-p1.js +22 -15
  99. package/lib/config/versions/magento-2.3.7-p2.js +22 -15
  100. package/lib/config/versions/magento-2.3.7-p3.js +22 -15
  101. package/lib/config/versions/magento-2.3.7-p4.js +22 -15
  102. package/lib/config/versions/magento-2.3.7.js +22 -15
  103. package/lib/config/versions/magento-2.4.0-p1.js +22 -15
  104. package/lib/config/versions/magento-2.4.0.js +22 -15
  105. package/lib/config/versions/magento-2.4.1-p1.js +23 -16
  106. package/lib/config/versions/magento-2.4.1.js +23 -16
  107. package/lib/config/versions/magento-2.4.2-p1.js +23 -16
  108. package/lib/config/versions/magento-2.4.2-p2.js +23 -16
  109. package/lib/config/versions/magento-2.4.2.js +23 -16
  110. package/lib/config/versions/magento-2.4.3-p1.js +23 -16
  111. package/lib/config/versions/magento-2.4.3-p2.js +23 -16
  112. package/lib/config/versions/magento-2.4.3-p3.js +23 -16
  113. package/lib/config/versions/magento-2.4.3.js +23 -16
  114. package/lib/config/versions/magento-2.4.4-p1.js +23 -16
  115. package/lib/config/versions/magento-2.4.4-p2.js +23 -16
  116. package/lib/config/versions/magento-2.4.4.js +23 -16
  117. package/lib/config/versions/magento-2.4.5-p1.js +23 -16
  118. package/lib/config/versions/magento-2.4.5.js +23 -17
  119. package/lib/config/xml-parser.js +21 -20
  120. package/lib/errors/known-error.js +8 -6
  121. package/lib/errors/unknown-error.js +8 -6
  122. package/lib/tasks/cache/create-cache-folder.js +10 -10
  123. package/lib/tasks/cache/index.js +1 -1
  124. package/lib/tasks/cache/remove-cache-folder.js +9 -9
  125. package/lib/tasks/cleanup.js +22 -24
  126. package/lib/tasks/cli/create-bashrc-config.js +19 -11
  127. package/lib/tasks/cli/index.js +10 -13
  128. package/lib/tasks/composer/index.js +20 -15
  129. package/lib/tasks/composer/local-auth-json.js +32 -18
  130. package/lib/tasks/database/connect-to-database.js +71 -51
  131. package/lib/tasks/database/create-magento-database.js +7 -7
  132. package/lib/tasks/database/create-magento-user.js +33 -20
  133. package/lib/tasks/database/default-magento-database.js +1 -1
  134. package/lib/tasks/database/default-magento-user.js +2 -2
  135. package/lib/tasks/database/dump-theme-config.js +16 -12
  136. package/lib/tasks/database/fix-db.js +62 -52
  137. package/lib/tasks/database/import-dump-to-database.js +122 -85
  138. package/lib/tasks/database/import-remote-db/index.js +16 -18
  139. package/lib/tasks/database/import-remote-db/ssh/database-dump-command.js +2 -2
  140. package/lib/tasks/database/import-remote-db/ssh/index.js +34 -35
  141. package/lib/tasks/database/import-remote-db/ssh/readymage.js +41 -38
  142. package/lib/tasks/database/import-remote-db/ssh/regular-server.js +44 -46
  143. package/lib/tasks/database/index.js +1 -1
  144. package/lib/tasks/database/magento-tables.js +3 -3
  145. package/lib/tasks/database/restore-theme-config.js +26 -19
  146. package/lib/tasks/docker/api.d.ts +1 -1
  147. package/lib/tasks/docker/api.js +31 -33
  148. package/lib/tasks/docker/containers/container-api.d.ts +49 -14
  149. package/lib/tasks/docker/containers/container-api.js +112 -83
  150. package/lib/tasks/docker/containers/index.js +3 -3
  151. package/lib/tasks/docker/containers/tasks.js +171 -99
  152. package/lib/tasks/docker/convert-composer-home-to-composer-cache-volume.js +34 -25
  153. package/lib/tasks/docker/convert-legacy-volumes.js +91 -55
  154. package/lib/tasks/docker/convert-mysql-to-mariadb.js +178 -147
  155. package/lib/tasks/docker/image/image-api.d.ts +2 -3
  156. package/lib/tasks/docker/image/image-api.js +41 -34
  157. package/lib/tasks/docker/image/index.js +2 -2
  158. package/lib/tasks/docker/index.js +26 -21
  159. package/lib/tasks/docker/network/index.js +3 -3
  160. package/lib/tasks/docker/network/network-api.d.ts +11 -8
  161. package/lib/tasks/docker/network/network-api.js +53 -61
  162. package/lib/tasks/docker/network/tasks.js +41 -31
  163. package/lib/tasks/docker/project-image-builder.js +174 -108
  164. package/lib/tasks/docker/system/index.js +2 -2
  165. package/lib/tasks/docker/system/system-api.d.ts +2 -2
  166. package/lib/tasks/docker/system/system-api.js +16 -19
  167. package/lib/tasks/docker/volume/index.js +3 -3
  168. package/lib/tasks/docker/volume/tasks.js +63 -46
  169. package/lib/tasks/docker/volume/volume-api.d.ts +8 -5
  170. package/lib/tasks/docker/volume/volume-api.js +59 -76
  171. package/lib/tasks/execute.js +91 -55
  172. package/lib/tasks/file-system/create-mariadb-config.js +18 -10
  173. package/lib/tasks/file-system/create-nginx-config.js +18 -19
  174. package/lib/tasks/file-system/create-php-config.js +12 -8
  175. package/lib/tasks/file-system/create-php-debug-config.js +23 -18
  176. package/lib/tasks/file-system/create-php-fpm-config.js +14 -9
  177. package/lib/tasks/file-system/create-phpstorm-config/database-config.js +144 -112
  178. package/lib/tasks/file-system/create-phpstorm-config/eslint-config.js +69 -45
  179. package/lib/tasks/file-system/create-phpstorm-config/exclude-folder-config.js +69 -70
  180. package/lib/tasks/file-system/create-phpstorm-config/index.js +28 -24
  181. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/coding-standard-config.js +9 -9
  182. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/config.js +23 -23
  183. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/custom-ruleset-path-config.js +22 -19
  184. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/default-properties-config.js +26 -16
  185. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/eslint-inspection-config.js +14 -15
  186. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/index.js +43 -34
  187. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/inspection-tools-config.js +14 -6
  188. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/magento-coding-standard-config.js +9 -9
  189. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/mess-detector-validation-inspection-config.js +53 -47
  190. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/paths.js +41 -12
  191. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/php-cs-fixer-validation-inspection-config.js +33 -30
  192. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/php-cs-validation-inspection-config.js +35 -38
  193. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/stylelint-inspection-config.js +14 -15
  194. package/lib/tasks/file-system/create-phpstorm-config/keys.js +10 -10
  195. package/lib/tasks/file-system/create-phpstorm-config/php-config/index.js +33 -25
  196. package/lib/tasks/file-system/create-phpstorm-config/php-config/mess-detector-config.js +28 -25
  197. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-code-sniffer-config.js +53 -32
  198. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-config.js +7 -7
  199. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-cs-fixer-config.js +37 -27
  200. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-interpreters-config.js +53 -31
  201. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-project-shared-configuration-config.js +42 -30
  202. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/index.js +33 -20
  203. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/php-docker-settings-config.js +3 -3
  204. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/setup-php-docker-container-settings-config.js +27 -16
  205. package/lib/tasks/file-system/create-phpstorm-config/setup-xml-structure.js +14 -13
  206. package/lib/tasks/file-system/create-phpstorm-config/stylelint-config.js +52 -34
  207. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/composer-settings-config.js +41 -33
  208. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/format-setting-config.js +39 -27
  209. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/index.js +34 -30
  210. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/mess-detector-project-configuration-config.js +32 -22
  211. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-code-sniffer-project-configuration-config.js +32 -22
  212. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-cs-fixer-project-configuration-config.js +32 -22
  213. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-debug-general-config.js +42 -31
  214. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-server-config.js +45 -33
  215. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-stan-project-configuration-config.js.js +32 -22
  216. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-workspace-project-configuration-config.js +22 -19
  217. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/properties-component-config.js +35 -21
  218. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/psalm-project-configuration-config.js.js +31 -22
  219. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/run-manager-config.js +38 -28
  220. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/workspace-config.js +5 -5
  221. package/lib/tasks/file-system/create-phpstorm-config/xml-utils.js +3 -2
  222. package/lib/tasks/file-system/create-ssl-terminator-config.js +46 -34
  223. package/lib/tasks/file-system/create-varnish-config.js +20 -23
  224. package/lib/tasks/file-system/create-vscode-config.js +66 -49
  225. package/lib/tasks/file-system/index.js +29 -25
  226. package/lib/tasks/import-dump.js +54 -45
  227. package/lib/tasks/link.js +24 -23
  228. package/lib/tasks/magento/enable-magento-composer-plugins.js +213 -149
  229. package/lib/tasks/magento/index.js +1 -1
  230. package/lib/tasks/magento/install-magento-project.js +158 -97
  231. package/lib/tasks/magento/remove-magento.js +30 -24
  232. package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js +27 -15
  233. package/lib/tasks/magento/setup-magento/configure-elasticsearch.js +23 -10
  234. package/lib/tasks/magento/setup-magento/create-admin.js +21 -13
  235. package/lib/tasks/magento/setup-magento/delete-admin-users.js +5 -5
  236. package/lib/tasks/magento/setup-magento/delete-customers.js +16 -10
  237. package/lib/tasks/magento/setup-magento/delete-orders.js +16 -10
  238. package/lib/tasks/magento/setup-magento/disable-2fa.js +11 -8
  239. package/lib/tasks/magento/setup-magento/disable-maintenance-mode.js +7 -7
  240. package/lib/tasks/magento/setup-magento/disable-page-builder.js +5 -4
  241. package/lib/tasks/magento/setup-magento/flush-redis-config.js +14 -8
  242. package/lib/tasks/magento/setup-magento/increase-admin-session-lifetime.js +21 -17
  243. package/lib/tasks/magento/setup-magento/index-products.js +4 -6
  244. package/lib/tasks/magento/setup-magento/index.js +54 -47
  245. package/lib/tasks/magento/setup-magento/install-magento.js +112 -79
  246. package/lib/tasks/magento/setup-magento/migrate-database.js +115 -96
  247. package/lib/tasks/magento/setup-magento/set-base-url.js +35 -21
  248. package/lib/tasks/magento/setup-magento/set-deployment-mode.js +15 -13
  249. package/lib/tasks/magento/setup-magento/set-mail-config.js +20 -14
  250. package/lib/tasks/magento/setup-magento/set-url-rewrite.js +13 -9
  251. package/lib/tasks/magento/setup-magento/upgrade-magento.js +30 -22
  252. package/lib/tasks/magento/setup-magento/urn-highlighter.js +11 -11
  253. package/lib/tasks/magento/setup-magento/varnish-config.js +42 -32
  254. package/lib/tasks/magento/setup-magento/waiting-for-redis.js +6 -8
  255. package/lib/tasks/magento/setup-magento/waiting-for-varnish.js +108 -65
  256. package/lib/tasks/magento/uninstall-magento.js +19 -16
  257. package/lib/tasks/php/php-container.d.ts +19 -0
  258. package/lib/tasks/php/php-container.js +50 -46
  259. package/lib/tasks/php/update-env-php.js +50 -46
  260. package/lib/tasks/project-config/index.js +12 -8
  261. package/lib/tasks/requirements/composer-credentials.js +215 -112
  262. package/lib/tasks/requirements/docker/context.js +49 -37
  263. package/lib/tasks/requirements/docker/index.js +123 -89
  264. package/lib/tasks/requirements/docker/install-on-mac.js +21 -14
  265. package/lib/tasks/requirements/docker/install.js +63 -52
  266. package/lib/tasks/requirements/docker/performance.js +40 -24
  267. package/lib/tasks/requirements/docker/permissions.js +27 -17
  268. package/lib/tasks/requirements/docker/running-status.js +79 -66
  269. package/lib/tasks/requirements/docker/version.js +14 -11
  270. package/lib/tasks/requirements/index.js +33 -29
  271. package/lib/tasks/requirements/node-version.js +8 -8
  272. package/lib/tasks/requirements/php-version.js +14 -11
  273. package/lib/tasks/requirements/platform.js +42 -26
  274. package/lib/tasks/requirements/rosetta.js +15 -12
  275. package/lib/tasks/start.js +172 -148
  276. package/lib/tasks/status/index.js +155 -88
  277. package/lib/tasks/stop.js +22 -18
  278. package/lib/tasks/theme/build-theme.js +50 -33
  279. package/lib/tasks/theme/install-theme.js +31 -18
  280. package/lib/tasks/theme/link-theme.js +27 -21
  281. package/lib/tasks/theme/retrieve-theme-data.js +24 -18
  282. package/lib/tasks/theme/setup-themes.js +87 -59
  283. package/lib/tasks/theme/symlink-theme.js +44 -22
  284. package/lib/util/CSA-theme.js +23 -21
  285. package/lib/util/analytics.js +130 -75
  286. package/lib/util/arch.js +22 -18
  287. package/lib/util/clean-object.js +15 -10
  288. package/lib/util/config-file-validator.js +64 -71
  289. package/lib/util/config-php-json.js +34 -16
  290. package/lib/util/connection-string.js +41 -27
  291. package/lib/util/console-block.js +112 -65
  292. package/lib/util/database.js +56 -33
  293. package/lib/util/deepmerge.d.ts +1 -1
  294. package/lib/util/deepmerge.js +19 -28
  295. package/lib/util/dockerfile-builder/build-instructions.js +159 -143
  296. package/lib/util/dockerfile-builder/index.js +47 -73
  297. package/lib/util/dockerfile-builder/types.d.ts +2 -1
  298. package/lib/util/download-file.js +28 -16
  299. package/lib/util/env-php-json.js +42 -16
  300. package/lib/util/exec-async-command.d.ts +9 -9
  301. package/lib/util/exec-async-command.js +82 -59
  302. package/lib/util/exec-async.d.ts +2 -0
  303. package/lib/util/exec-async.js +12 -5
  304. package/lib/util/execute-in-container.js +22 -27
  305. package/lib/util/execute-sudo-command.js +11 -15
  306. package/lib/util/get-brew-bin-path.js +27 -23
  307. package/lib/util/get-installed-magento-version.js +22 -16
  308. package/lib/util/get-jsonfile-data.js +14 -9
  309. package/lib/util/install-dependencies-task.js +53 -41
  310. package/lib/util/instance-metadata.js +44 -29
  311. package/lib/util/ip.js +16 -12
  312. package/lib/util/is-running-root.js +6 -3
  313. package/lib/util/is-wsl.js +10 -10
  314. package/lib/util/macos-version.js +12 -11
  315. package/lib/util/magento-task.js +14 -9
  316. package/lib/util/match-filesystem.js +22 -16
  317. package/lib/util/move-file.js +40 -25
  318. package/lib/util/nginx-logs-parser.js +50 -39
  319. package/lib/util/open-browser.js +8 -5
  320. package/lib/util/os-platform.js +40 -32
  321. package/lib/util/path-exists-sync.js +10 -6
  322. package/lib/util/path-exists.js +6 -6
  323. package/lib/util/php-task.js +11 -10
  324. package/lib/util/portscanner.js +97 -85
  325. package/lib/util/prefix.js +31 -22
  326. package/lib/util/resolve-configuration-with-overrides.js +30 -15
  327. package/lib/util/rmdir-safe.js +15 -11
  328. package/lib/util/run-composer.js +16 -16
  329. package/lib/util/run-container-image.js +9 -4
  330. package/lib/util/run-magento.js +16 -17
  331. package/lib/util/run-php.js +16 -21
  332. package/lib/util/safe-regex-extract.js +8 -12
  333. package/lib/util/set-config.js +24 -15
  334. package/lib/util/sleep.js +7 -2
  335. package/lib/util/systemctl.js +62 -44
  336. package/lib/util/wait-for-it.js +42 -33
  337. package/lib/util/wait-for-logs.js +42 -35
  338. package/lib/util/xdg-open-exists.js +19 -19
  339. package/package.json +7 -3
  340. package/tsconfig.json +24 -0
  341. package/typings/context.d.ts +76 -34
  342. package/typings/index.d.ts +41 -38
  343. package/typings/override.d.ts +14 -0
  344. package/typings/phpstorm.d.ts +19 -19
  345. package/.prettierrc +0 -3
  346. package/lib/util/get-php-for-phpbrew.js +0 -30
  347. package/lib/util/request.js +0 -0
@@ -1,69 +1,59 @@
1
- const os = require('os');
2
- const path = require('path');
3
- const getPhpConfig = require('./php-config');
4
- const { isIpAddress } = require('../util/ip');
1
+ const os = require('os')
2
+ const path = require('path')
3
+ const getPhpConfig = require('./php-config')
4
+ const { isIpAddress } = require('../util/ip')
5
5
 
6
- const systeminformation = require('systeminformation');
7
- const { deepmerge } = require('../util/deepmerge');
8
- const defaultEsEnv = require('./services/elasticsearch/default-es-env');
9
- const logger = require('@scandipwa/scandipwa-dev-utils/logger');
10
- const defaultMagentoUser = require('../tasks/database/default-magento-user');
6
+ const systeminformation = require('systeminformation')
7
+ const { deepmerge } = require('../util/deepmerge')
8
+ const defaultEsEnv = require('./services/elasticsearch/default-es-env')
9
+ const logger = require('@scandipwa/scandipwa-dev-utils/logger')
10
+ const defaultMagentoUser = require('../tasks/database/default-magento-user')
11
11
 
12
12
  /**
13
13
  *
14
14
  * @param {import('../../typings/context').ListrContext} ctx
15
15
  * @param {import('../../typings/context').ListrContext['config']['overridenConfiguration']} overridenConfiguration
16
16
  * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
17
- * @returns
18
17
  */
19
18
  module.exports = async (ctx, overridenConfiguration, baseConfig) => {
20
- const { configuration, ssl, host } = overridenConfiguration;
21
- const {
22
- nginx,
23
- redis,
24
- elasticsearch,
25
- mariadb,
26
- varnish,
27
- maildev,
28
- newRelic
29
- } = configuration;
19
+ const { configuration, ssl, host } = overridenConfiguration
20
+ const { nginx, redis, elasticsearch, mariadb, varnish, maildev } =
21
+ configuration
30
22
 
31
- const php = getPhpConfig(overridenConfiguration, baseConfig);
32
- const {
33
- prefix,
34
- magentoDir,
35
- containerMagentoDir,
36
- cacheDir
37
- } = baseConfig;
23
+ const php = getPhpConfig(overridenConfiguration, baseConfig)
24
+ const { prefix, magentoDir, containerMagentoDir, cacheDir } = baseConfig
38
25
 
39
- const cpuSupportedFlags = (await systeminformation.cpuFlags()).split(' ');
26
+ const cpuSupportedFlags = (await systeminformation.cpuFlags()).split(' ')
40
27
 
41
28
  const network = {
42
- name: `${ prefix }_network`
43
- };
29
+ name: `${prefix}_network`
30
+ }
44
31
 
32
+ /**
33
+ * @type {Record<string, { name: string, driver?: string, opt?: { mode?: string, device?: string, o?: string, type?: string } }>}
34
+ */
45
35
  const volumes = {
46
36
  mariadb: {
47
- name: `${ prefix }_mariadb-data`
37
+ name: `${prefix}_mariadb-data`
48
38
  },
49
39
  redis: {
50
- name: `${ prefix }_redis-data`
40
+ name: `${prefix}_redis-data`
51
41
  },
52
42
  elasticsearch: {
53
- name: `${ prefix }_elasticsearch-data`
43
+ name: `${prefix}_elasticsearch-data`
54
44
  },
55
45
  maildev: {
56
- name: `${ prefix }_maildev-data`
46
+ name: `${prefix}_maildev-data`
57
47
  },
58
48
  composer_cache: {
59
49
  name: 'composer_cache-data',
60
- opts: {
50
+ opt: {
61
51
  mode: 'z'
62
52
  }
63
53
  }
64
- };
54
+ }
65
55
 
66
- const { isDockerDesktop } = ctx;
56
+ const { isDockerDesktop } = ctx
67
57
 
68
58
  if (isDockerDesktop) {
69
59
  /**
@@ -71,109 +61,138 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
71
61
  * we need create named volumes to avoid performance penalty
72
62
  */
73
63
  volumes.php = {
74
- name: `${ prefix }_project-data`,
64
+ name: `${prefix}_project-data`,
75
65
  driver: 'local',
76
66
  opt: {
77
67
  type: 'none',
78
68
  device: path.join(magentoDir),
79
69
  o: 'bind'
80
70
  }
81
- };
71
+ }
82
72
  volumes.nginx = {
83
- name: `${ prefix }_nginx-data`,
73
+ name: `${prefix}_nginx-data`,
84
74
  driver: 'local',
85
75
  opt: {
86
76
  type: 'none',
87
77
  device: path.join(cacheDir, 'nginx', 'conf.d'),
88
78
  o: 'bind'
89
79
  }
90
- };
80
+ }
91
81
  volumes.appPub = {
92
- name: `${ prefix }_pub-data`,
82
+ name: `${prefix}_pub-data`,
93
83
  driver: 'local',
94
84
  opt: {
95
85
  type: 'none',
96
86
  device: path.join(magentoDir, 'pub'),
97
87
  o: 'bind'
98
88
  }
99
- };
89
+ }
100
90
  volumes.appSetup = {
101
- name: `${ prefix }_setup-data`,
91
+ name: `${prefix}_setup-data`,
102
92
  driver: 'local',
103
93
  opt: {
104
94
  type: 'none',
105
95
  device: path.join(magentoDir, 'setup'),
106
96
  o: 'bind'
107
97
  }
108
- };
98
+ }
109
99
  volumes.sslTerminator = {
110
- name: `${ prefix }_ssl-terminator-data`,
100
+ name: `${prefix}_ssl-terminator-data`,
111
101
  driver: 'local',
112
102
  opt: {
113
103
  type: 'none',
114
104
  device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
115
105
  o: 'bind'
116
106
  }
117
- };
107
+ }
118
108
 
119
109
  if (varnish.enabled) {
120
110
  volumes.varnish = {
121
- name: `${ prefix }_varnish-data`,
111
+ name: `${prefix}_varnish-data`,
122
112
  driver: 'local',
123
113
  opt: {
124
114
  type: 'none',
125
115
  device: path.join(cacheDir, 'varnish'),
126
116
  o: 'bind'
127
117
  }
128
- };
118
+ }
129
119
  }
130
120
  }
131
121
 
122
+ /**
123
+ * @param {Record<string, number>} ports
124
+ */
132
125
  const getContainers = (ports = {}) => {
133
126
  /**
134
- * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions>}
127
+ * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], debugImage?: string, remoteImages?: string[], connectCommand?: string[], description?: string }>}
135
128
  */
136
129
  const dockerConfig = {
137
130
  php: {
138
131
  _: 'PHP',
139
- ports: isDockerDesktop ? [
140
- `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.fpm }:9000`
141
- ] : [],
132
+ ports: isDockerDesktop
133
+ ? [
134
+ `${isIpAddress(host) ? host : '127.0.0.1'}:${
135
+ ports.fpm
136
+ }:9000`
137
+ ]
138
+ : [],
142
139
  forwardedPorts: [
143
140
  isDockerDesktop
144
- ? `127.0.0.1:${ ports.fpm }:9000`
145
- : `127.0.0.1:${ ports.fpm }`
141
+ ? `127.0.0.1:${ports.fpm}:9000`
142
+ : `127.0.0.1:${ports.fpm}`
146
143
  ],
147
144
  network: isDockerDesktop ? network.name : 'host',
148
145
  mountVolumes: [
149
- `${ !isDockerDesktop ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
150
- `${ volumes.composer_cache.name }:/composer/home/cache`,
151
- `${ php.iniPath }:/usr/local/etc/php/php.ini`,
152
- `${ php.fpmConfPath }:/usr/local/etc/php-fpm.d/zz-docker.conf`
153
- ].concat(ctx.debug ? [`${ php.debugIniPath }:/usr/local/etc/php/conf.d/00-xdebug.ini`] : []),
154
- env: {
155
- COMPOSER_AUTH: JSON.stringify(JSON.parse(process.env.COMPOSER_AUTH), null, 0) || ''
156
- },
146
+ `${
147
+ !isDockerDesktop ? magentoDir : volumes.php.name
148
+ }:${containerMagentoDir}`,
149
+ `${volumes.composer_cache.name}:/composer/home/cache`,
150
+ `${php.iniPath}:/usr/local/etc/php/php.ini`,
151
+ `${php.fpmConfPath}:/usr/local/etc/php-fpm.d/zz-docker.conf`
152
+ ].concat(
153
+ ctx.debug
154
+ ? [
155
+ `${php.debugIniPath}:/usr/local/etc/php/conf.d/00-xdebug.ini`
156
+ ]
157
+ : []
158
+ ),
159
+ env: process.env.COMPOSER_AUTH
160
+ ? {
161
+ COMPOSER_AUTH: JSON.stringify(
162
+ JSON.parse(process.env.COMPOSER_AUTH),
163
+ null,
164
+ 0
165
+ )
166
+ }
167
+ : {},
157
168
  restart: 'on-failure:5',
158
- image: `local-cma-project:${ prefix }`,
159
- debugImage: `local-cma-project:${ prefix }.debug`,
169
+ image: `local-cma-project:${prefix}`,
170
+ debugImage: `local-cma-project:${prefix}.debug`,
160
171
  remoteImages: [
161
172
  configuration.php.baseImage,
162
173
  configuration.php.debugImage
163
174
  ],
164
- name: `${ prefix }_php`,
175
+ name: `${prefix}_php`,
165
176
  connectCommand: ['/bin/sh'],
166
- user: ((ctx.platform === 'linux' && isDockerDesktop) || !isDockerDesktop) ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
177
+ user:
178
+ (ctx.platform === 'linux' && isDockerDesktop) ||
179
+ !isDockerDesktop
180
+ ? `${os.userInfo().uid}:${os.userInfo().gid}`
181
+ : ''
167
182
  },
168
183
  sslTerminator: {
169
184
  _: 'SSL Terminator (Nginx)',
170
- ports: isDockerDesktop ? [
171
- `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
172
- ] : [],
185
+ ports: isDockerDesktop
186
+ ? [
187
+ `${isIpAddress(host) ? host : '127.0.0.1'}:${
188
+ ports.sslTerminator
189
+ }:80`
190
+ ]
191
+ : [],
173
192
  forwardedPorts: [
174
193
  isDockerDesktop
175
- ? `127.0.0.1:${ ports.sslTerminator }:80`
176
- : `127.0.0.1:${ ports.sslTerminator }`
194
+ ? `127.0.0.1:${ports.sslTerminator}:80`
195
+ : `127.0.0.1:${ports.sslTerminator}`
177
196
  ],
178
197
  healthCheck: {
179
198
  cmd: 'service nginx status'
@@ -182,24 +201,38 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
182
201
  * Mount volumes directly on linux
183
202
  */
184
203
  mountVolumes: [
185
- `${ !isDockerDesktop ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`,
186
- `${ path.join(cacheDir, 'ssl-terminator', 'fastcgi_params') }:/etc/nginx/fastcgi_params`
204
+ `${
205
+ !isDockerDesktop
206
+ ? path.join(cacheDir, 'ssl-terminator', 'conf.d')
207
+ : volumes.sslTerminator.name
208
+ }:/etc/nginx/conf.d`,
209
+ `${path.join(
210
+ cacheDir,
211
+ 'ssl-terminator',
212
+ 'fastcgi_params'
213
+ )}:/etc/nginx/fastcgi_params`
187
214
  ],
188
215
  restart: 'on-failure:5',
189
216
  network: isDockerDesktop ? network.name : 'host',
190
- image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
191
- name: `${ prefix }_ssl-terminator`,
217
+ image: `${
218
+ nginx.version ? `nginx:${nginx.version}` : nginx.image
219
+ }`,
220
+ name: `${prefix}_ssl-terminator`,
192
221
  command: "nginx -g 'daemon off;'"
193
222
  },
194
223
  nginx: {
195
224
  _: 'Nginx',
196
- ports: isDockerDesktop ? [
197
- `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.app }:80`
198
- ] : [],
225
+ ports: isDockerDesktop
226
+ ? [
227
+ `${isIpAddress(host) ? host : '127.0.0.1'}:${
228
+ ports.app
229
+ }:80`
230
+ ]
231
+ : [],
199
232
  forwardedPorts: [
200
233
  isDockerDesktop
201
- ? `127.0.0.1:${ ports.app }:80`
202
- : `127.0.0.1:${ ports.app }`
234
+ ? `127.0.0.1:${ports.app}:80`
235
+ : `127.0.0.1:${ports.app}`
203
236
  ],
204
237
  healthCheck: {
205
238
  cmd: 'service nginx status'
@@ -207,21 +240,45 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
207
240
  /**
208
241
  * Mount volumes directly on linux
209
242
  */
210
- mountVolumes: !isDockerDesktop ? [
211
- `${ cacheDir }/nginx/conf.d:/etc/nginx/conf.d`,
212
- `${ path.join(magentoDir, 'pub') }:${path.join(containerMagentoDir, 'pub')}`,
213
- `${ path.join(magentoDir, 'setup') }:${path.join(containerMagentoDir, 'setup')}`,
214
- `${ path.join(cacheDir, 'ssl-terminator', 'fastcgi_params') }:/etc/nginx/fastcgi_params`
215
- ] : [
216
- `${ volumes.nginx.name }:/etc/nginx/conf.d`,
217
- `${ volumes.appPub.name }:${path.join(containerMagentoDir, 'pub')}`,
218
- `${ volumes.appSetup.name }:${path.join(containerMagentoDir, 'setup')}`,
219
- `${ path.join(cacheDir, 'ssl-terminator', 'fastcgi_params') }:/etc/nginx/fastcgi_params`
220
- ],
243
+ mountVolumes: !isDockerDesktop
244
+ ? [
245
+ `${cacheDir}/nginx/conf.d:/etc/nginx/conf.d`,
246
+ `${path.join(magentoDir, 'pub')}:${path.join(
247
+ containerMagentoDir,
248
+ 'pub'
249
+ )}`,
250
+ `${path.join(magentoDir, 'setup')}:${path.join(
251
+ containerMagentoDir,
252
+ 'setup'
253
+ )}`,
254
+ `${path.join(
255
+ cacheDir,
256
+ 'ssl-terminator',
257
+ 'fastcgi_params'
258
+ )}:/etc/nginx/fastcgi_params`
259
+ ]
260
+ : [
261
+ `${volumes.nginx.name}:/etc/nginx/conf.d`,
262
+ `${volumes.appPub.name}:${path.join(
263
+ containerMagentoDir,
264
+ 'pub'
265
+ )}`,
266
+ `${volumes.appSetup.name}:${path.join(
267
+ containerMagentoDir,
268
+ 'setup'
269
+ )}`,
270
+ `${path.join(
271
+ cacheDir,
272
+ 'ssl-terminator',
273
+ 'fastcgi_params'
274
+ )}:/etc/nginx/fastcgi_params`
275
+ ],
221
276
  restart: 'on-failure:5',
222
277
  network: isDockerDesktop ? network.name : 'host',
223
- image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
224
- name: `${ prefix }_nginx`,
278
+ image: `${
279
+ nginx.version ? `nginx:${nginx.version}` : nginx.image
280
+ }`,
281
+ name: `${prefix}_nginx`,
225
282
  command: "nginx -g 'daemon off;'"
226
283
  },
227
284
  redis: {
@@ -229,12 +286,14 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
229
286
  healthCheck: {
230
287
  cmd: 'redis-cli ping'
231
288
  },
232
- ports: [`127.0.0.1:${ ports.redis }:6379`],
233
- forwardedPorts: [`127.0.0.1:${ ports.redis }:6379`],
234
- mounts: [`source=${ volumes.redis.name },target=/data`],
289
+ ports: [`127.0.0.1:${ports.redis}:6379`],
290
+ forwardedPorts: [`127.0.0.1:${ports.redis}:6379`],
291
+ mounts: [`source=${volumes.redis.name},target=/data`],
235
292
  network: network.name,
236
- image: `${ redis.version ? `redis:${ redis.version }` : redis.image }`,
237
- name: `${ prefix }_redis`,
293
+ image: `${
294
+ redis.version ? `redis:${redis.version}` : redis.image
295
+ }`,
296
+ name: `${prefix}_redis`,
238
297
  connectCommand: ['redis-cli']
239
298
  },
240
299
  mariadb: {
@@ -242,134 +301,160 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
242
301
  healthCheck: {
243
302
  cmd: 'mysqladmin ping --silent'
244
303
  },
245
- ports: [`127.0.0.1:${ ports.mariadb }:3306`],
246
- forwardedPorts: [`127.0.0.1:${ ports.mariadb }:3306`],
304
+ ports: [`127.0.0.1:${ports.mariadb}:3306`],
305
+ forwardedPorts: [`127.0.0.1:${ports.mariadb}:3306`],
247
306
  mountVolumes: [
248
- `${ volumes.mariadb.name }:/var/lib/mysql`,
249
- `${ path.join(baseConfig.cacheDir, 'mariadb.cnf') }:/etc/mysql/my.cnf`
307
+ `${volumes.mariadb.name}:/var/lib/mysql`,
308
+ `${path.join(
309
+ baseConfig.cacheDir,
310
+ 'mariadb.cnf'
311
+ )}:/etc/mysql/my.cnf`
250
312
  ],
251
313
  env: {
252
314
  MARIADB_ROOT_PASSWORD: 'scandipwa'
253
315
  },
254
316
  command: '--log_bin_trust_function_creators=1',
255
- securityOptions: [
256
- 'seccomp=unconfined'
257
- ],
317
+ securityOptions: ['seccomp=unconfined'],
258
318
  network: network.name,
259
- image: `${ mariadb.version ? `mariadb:${ mariadb.version }` : mariadb.image }`,
260
- name: `${ prefix }_mariadb`,
319
+ image: `${
320
+ mariadb.version
321
+ ? `mariadb:${mariadb.version}`
322
+ : mariadb.image
323
+ }`,
324
+ name: `${prefix}_mariadb`,
261
325
  description: `To connect to MariaDB you can use the following users:
262
- - User ${ logger.style.command('root') } with password ${ logger.style.command('scandipwa') }
263
- - User ${ logger.style.command(defaultMagentoUser.user) } with password ${ logger.style.command(defaultMagentoUser.password) }`
326
+ - User ${logger.style.command('root')} with password ${logger.style.command(
327
+ 'scandipwa'
328
+ )}
329
+ - User ${logger.style.command(
330
+ defaultMagentoUser.user
331
+ )} with password ${logger.style.command(
332
+ defaultMagentoUser.password
333
+ )}`
264
334
  },
265
335
  elasticsearch: {
266
336
  _: 'ElasticSearch',
267
337
  healthCheck: {
268
338
  cmd: 'curl --silent --fail localhost:9200/_cluster/health || exit 1'
269
339
  },
270
- ports: [`127.0.0.1:${ ports.elasticsearch }:9200`],
271
- forwardedPorts: [`127.0.0.1:${ ports.elasticsearch }:9200`],
272
- mounts: [`source=${ volumes.elasticsearch.name },target=/usr/share/elasticsearch/data`],
340
+ ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
341
+ forwardedPorts: [`127.0.0.1:${ports.elasticsearch}:9200`],
342
+ mounts: [
343
+ `source=${volumes.elasticsearch.name},target=/usr/share/elasticsearch/data`
344
+ ],
273
345
  env: deepmerge(
274
346
  {
275
- // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
276
- 'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
277
- }, elasticsearch.env || defaultEsEnv
347
+ // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
348
+ 'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some(
349
+ (sse42Flag) => cpuSupportedFlags.includes(sse42Flag)
350
+ )
351
+ },
352
+ elasticsearch.env || defaultEsEnv
278
353
  ),
279
354
  network: network.name,
280
- image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
281
- name: `${ prefix }_elasticsearch`
355
+ image: `${
356
+ elasticsearch.version
357
+ ? `elasticsearch:${elasticsearch.version}`
358
+ : elasticsearch.image
359
+ }`,
360
+ name: `${prefix}_elasticsearch`
282
361
  },
283
362
  maildev: {
284
363
  _: 'MailDev',
285
- ports: isDockerDesktop ? [
286
- `127.0.0.1:${ ports.maildevWeb }:1080`,
287
- `127.0.0.1:${ ports.maildevSMTP }:1025`
288
- ] : [],
289
- forwardedPorts: isDockerDesktop ? [
290
- `127.0.0.1:${ ports.maildevWeb }:1080`,
291
- `127.0.0.1:${ ports.maildevSMTP }:1025`
292
- ] : [
293
- `127.0.0.1:${ ports.maildevWeb }`,
294
- `127.0.0.1:${ ports.maildevSMTP }`
295
- ],
296
- mountVolumes: [
297
- `${ volumes.maildev.name }:/tmp/maildev`
298
- ],
364
+ ports: isDockerDesktop
365
+ ? [
366
+ `127.0.0.1:${ports.maildevWeb}:1080`,
367
+ `127.0.0.1:${ports.maildevSMTP}:1025`
368
+ ]
369
+ : [],
370
+ forwardedPorts: isDockerDesktop
371
+ ? [
372
+ `127.0.0.1:${ports.maildevWeb}:1080`,
373
+ `127.0.0.1:${ports.maildevSMTP}:1025`
374
+ ]
375
+ : [
376
+ `127.0.0.1:${ports.maildevWeb}`,
377
+ `127.0.0.1:${ports.maildevSMTP}`
378
+ ],
379
+ mountVolumes: [`${volumes.maildev.name}:/tmp/maildev`],
299
380
  env: {
300
- MAILDEV_SMTP_PORT: isDockerDesktop ? '1025' : ports.maildevSMTP,
301
- MAILDEV_WEB_PORT: isDockerDesktop ? '1080' : ports.maildevWeb,
381
+ MAILDEV_SMTP_PORT: isDockerDesktop
382
+ ? '1025'
383
+ : ports.maildevSMTP,
384
+ MAILDEV_WEB_PORT: isDockerDesktop
385
+ ? '1080'
386
+ : ports.maildevWeb,
302
387
  MAILDEV_MAIL_DIRECTORY: '/tmp/maildev'
303
388
  },
304
- name: `${ prefix }_maildev`,
389
+ name: `${prefix}_maildev`,
305
390
  network: isDockerDesktop ? network.name : 'host',
306
391
  image: maildev.image,
307
392
  user: !isDockerDesktop ? 'root:root' : '',
308
393
  connectCommand: ['/bin/sh'],
309
394
  healthCheck: {
310
- cmd: `wget -O - http://127.0.0.1:${ isDockerDesktop ? '1080' : ports.maildevWeb }/healthz || exit 1`
395
+ cmd: `wget -O - http://127.0.0.1:${
396
+ isDockerDesktop ? '1080' : ports.maildevWeb
397
+ }/healthz || exit 1`
311
398
  }
312
399
  }
313
- };
400
+ }
314
401
 
315
- if (ssl.enabled && isDockerDesktop) {
402
+ if (ssl && ssl.enabled && isDockerDesktop) {
316
403
  dockerConfig.sslTerminator.ports.push(
317
404
  `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
318
- );
405
+ )
319
406
  }
320
407
 
321
408
  if (!ctx.debug && varnish.enabled) {
322
409
  dockerConfig.varnish = {
323
410
  _: 'Varnish',
324
- image: `${ varnish.version ? `varnish:${ varnish.version }` : varnish.image }`,
325
- name: `${ prefix }_varnish`,
411
+ image: `${
412
+ varnish.version
413
+ ? `varnish:${varnish.version}`
414
+ : varnish.image
415
+ }`,
416
+ name: `${prefix}_varnish`,
326
417
  mountVolumes: [
327
- `${ !isDockerDesktop ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
418
+ `${
419
+ !isDockerDesktop
420
+ ? path.join(cacheDir, 'varnish')
421
+ : volumes.varnish.name
422
+ }:/etc/varnish`
328
423
  ],
329
- ports: isDockerDesktop ? [
330
- `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
331
- ] : [],
424
+ ports: isDockerDesktop
425
+ ? [
426
+ `${isIpAddress(host) ? host : '127.0.0.1'}:${
427
+ ports.varnish
428
+ }:80`
429
+ ]
430
+ : [],
332
431
  forwardedPorts: [
333
432
  isDockerDesktop
334
- ? `127.0.0.1:${ ports.varnish }:80`
335
- : `127.0.0.1:${ ports.varnish }`
433
+ ? `127.0.0.1:${ports.varnish}:80`
434
+ : `127.0.0.1:${ports.varnish}`
336
435
  ],
337
436
  env: {
338
437
  VARNISH_SIZE: '2G'
339
438
  },
340
439
  restart: 'on-failure:30',
341
440
  network: isDockerDesktop ? network.name : 'host',
342
- // eslint-disable-next-line max-len
343
- command: `/bin/bash -c "varnishd -a :${ isDockerDesktop ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s Cache=malloc,2048m -s Transient=malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
344
- tmpfs: [
345
- '/var/lib/varnish:exec'
346
- ],
347
- description: `Varnish HealthCheck status: ${ logger.style.command(varnish.healthCheck ? 'enabled' : 'disabled') }`
348
- };
349
- }
350
441
 
351
- if (newRelic.enabled) {
352
- dockerConfig.newRelicPHPDaemon = {
353
- _: 'New Relic PHP daemon',
354
- ports: [],
355
- name: `${ prefix }_newrelic-php-daemon`,
356
- network: isDockerDesktop ? network.name : 'host',
357
- image: 'newrelic/php-daemon',
358
- mountVolumes: [
359
- '/var/run/docker.sock:/var/run/docker.sock',
360
- '/:/host:ro',
361
- `${path.join(process.cwd(), 'newrelic-infra.yml')}:/etc/newrelic-infra.yml`
362
- ],
363
- capAdd: 'SYS_PTRACE'
364
- };
442
+ command: `/bin/bash -c "varnishd -a :${
443
+ isDockerDesktop ? 80 : ports.varnish
444
+ } -t 600 -f /etc/varnish/default.vcl -s Cache=malloc,2048m -s Transient=malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
445
+ tmpfs: ['/var/lib/varnish:exec'],
446
+ description: `Varnish HealthCheck status: ${logger.style.command(
447
+ varnish.healthCheck ? 'enabled' : 'disabled'
448
+ )}`
449
+ }
365
450
  }
366
451
 
367
- return dockerConfig;
368
- };
452
+ return dockerConfig
453
+ }
369
454
 
370
455
  return {
371
456
  network,
372
457
  volumes,
373
458
  getContainers
374
- };
375
- };
459
+ }
460
+ }