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