@scandipwa/magento-scripts 2.0.0-alpha.2 → 2.0.0-alpha.21

package/lib/config/docker.js

@@ -6,6 +6,8 @@ const { isIpAddress } = require('../util/ip');
 const systeminformation = require('systeminformation');
 const { deepmerge } = require('../util/deepmerge');
 const defaultEsEnv = require('./services/elasticsearch/default-es-env');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const defaultMagentoUser = require('../tasks/database/default-magento-user');
 
 /**
  *
@@ -21,10 +23,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         redis,
         elasticsearch,
         mariadb,
-        varnish
+        varnish,
+        maildev
     } = configuration;
 
-    const php = getPhpConfig(configuration, baseConfig);
+    const php = getPhpConfig(overridenConfiguration, baseConfig);
     const {
         prefix,
         magentoDir,
@@ -48,56 +51,65 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         elasticsearch: {
             name: `${ prefix }_elasticsearch-data`
         },
-        composer_home: {
-            name: 'composer_home-data'
+        composer_cache: {
+            name: 'composer_cache-data',
+            opts: {
+                mode: 'z'
+            }
+        },
+        maildev: {
+            name: `${ prefix }_maildev-data`
         }
     };
 
-    const isLinux = ctx.platform === 'linux';
-    const { isWsl } = ctx;
-    const isNotNativeLinux = (!isLinux || isWsl);
+    const { isDockerDesktop } = ctx;
 
-    if (!isLinux) {
+    if (isDockerDesktop) {
         /**
-         * When CMA is running in non-native linux environment,
-         * we need also create named volumes for nginx to avoid performance penalty
+         * When CMA is running with Docker Desktop,
+         * we need create named volumes to avoid performance penalty
          */
         volumes.php = {
             name: `${ prefix }_project-data`,
+            driver: 'local',
             opt: {
-                type: 'nfs',
+                type: 'none',
                 device: path.join(magentoDir),
                 o: 'bind'
             }
         };
         volumes.nginx = {
             name: `${ prefix }_nginx-data`,
+            driver: 'local',
             opt: {
-                type: 'nfs',
+                type: 'none',
                 device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
             }
         };
         volumes.appPub = {
             name: `${ prefix }_pub-data`,
+            driver: 'local',
             opt: {
-                type: 'nfs',
+                type: 'none',
                 device: path.join(magentoDir, 'pub'),
                 o: 'bind'
             }
         };
         volumes.appSetup = {
             name: `${ prefix }_setup-data`,
+            driver: 'local',
             opt: {
-                type: 'nfs',
+                type: 'none',
                 device: path.join(magentoDir, 'setup'),
                 o: 'bind'
             }
         };
         volumes.sslTerminator = {
             name: `${ prefix }_ssl-terminator-data`,
+            driver: 'local',
             opt: {
-                type: 'nfs',
+                type: 'none',
                 device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
             }
@@ -106,8 +118,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         if (varnish.enabled) {
             volumes.varnish = {
                 name: `${ prefix }_varnish-data`,
+                driver: 'local',
                 opt: {
-                    type: 'nfs',
+                    type: 'none',
                     device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
                 }
@@ -122,24 +135,23 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         const dockerConfig = {
             php: {
                 _: 'PHP',
-                ports: isNotNativeLinux ? [
+                ports: isDockerDesktop ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.fpm }:9000`
                 ] : [],
                 forwardedPorts: [
-                    isNotNativeLinux
+                    isDockerDesktop
                         ? `127.0.0.1:${ ports.fpm }:9000`
                         : `127.0.0.1:${ ports.fpm }`
                 ],
-                network: isNotNativeLinux ? network.name : 'host',
+                network: isDockerDesktop ? network.name : 'host',
                 mountVolumes: [
-                    `${ isLinux ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
-                    `${ volumes.composer_home.name }:/composer/home`,
+                    `${ !isDockerDesktop ? magentoDir : volumes.php.name }:${containerMagentoDir}`,
+                    `${ volumes.composer_cache.name }:/composer/home/cache`,
                     `${ php.iniPath }:/usr/local/etc/php/php.ini`,
                     `${ php.fpmConfPath }:/usr/local/etc/php-fpm.d/zz-docker.conf`
-                ],
+                ].concat(ctx.debug ? [`${ php.debugIniPath }:/usr/local/etc/php/conf.d/00-xdebug.ini`] : []),
                 env: {
-                    COMPOSER_AUTH: process.env.COMPOSER_AUTH || '',
-                    COMPOSER_HOME: '/composer/home'
+                    COMPOSER_AUTH: JSON.stringify(JSON.parse(process.env.COMPOSER_AUTH), null, 0) || ''
                 },
                 restart: 'on-failure:5',
                 image: `local-cma-project:${ prefix }`,
@@ -150,15 +162,15 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ],
                 name: `${ prefix }_php`,
                 connectCommand: ['/bin/sh'],
-                user: isLinux ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
+                user: ((ctx.platform === 'linux' && isDockerDesktop) || !isDockerDesktop) ? `${os.userInfo().uid}:${os.userInfo().gid}` : ''
             },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
-                ports: isNotNativeLinux ? [
+                ports: isDockerDesktop ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
                 ] : [],
                 forwardedPorts: [
-                    isNotNativeLinux
+                    isDockerDesktop
                         ? `127.0.0.1:${ ports.sslTerminator }:80`
                         : `127.0.0.1:${ ports.sslTerminator }`
                 ],
@@ -169,21 +181,21 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                  * Mount volumes directly on linux
                  */
                 mountVolumes: [
-                    `${ isLinux ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
+                    `${ !isDockerDesktop ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
                 ],
                 restart: 'on-failure:5',
-                network: isNotNativeLinux ? network.name : 'host',
+                network: isDockerDesktop ? network.name : 'host',
                 image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_ssl-terminator`,
                 command: "nginx -g 'daemon off;'"
             },
             nginx: {
                 _: 'Nginx',
-                ports: isNotNativeLinux ? [
+                ports: isDockerDesktop ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.app }:80`
                 ] : [],
                 forwardedPorts: [
-                    isNotNativeLinux
+                    isDockerDesktop
                         ? `127.0.0.1:${ ports.app }:80`
                         : `127.0.0.1:${ ports.app }`
                 ],
@@ -193,7 +205,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 /**
                  * Mount volumes directly on linux
                  */
-                mountVolumes: isLinux ? [
+                mountVolumes: !isDockerDesktop ? [
                     `${ cacheDir }/nginx/conf.d:/etc/nginx/conf.d`,
                     `${ path.join(magentoDir, 'pub') }:${path.join(containerMagentoDir, 'pub')}`,
                     `${ path.join(magentoDir, 'setup') }:${path.join(containerMagentoDir, 'setup')}`
@@ -203,8 +215,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     `${ volumes.appSetup.name }:${path.join(containerMagentoDir, 'setup')}`
                 ],
                 restart: 'on-failure:5',
-                // TODO: use connect instead
-                network: isNotNativeLinux ? network.name : 'host',
+                network: isDockerDesktop ? network.name : 'host',
                 image: `${ nginx.version ? `nginx:${ nginx.version }` : nginx.image }`,
                 name: `${ prefix }_nginx`,
                 command: "nginx -g 'daemon off;'"
@@ -217,7 +228,6 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ports: [`127.0.0.1:${ ports.redis }:6379`],
                 forwardedPorts: [`127.0.0.1:${ ports.redis }:6379`],
                 mounts: [`source=${ volumes.redis.name },target=/data`],
-                // TODO: use connect instead
                 network: network.name,
                 image: `${ redis.version ? `redis:${ redis.version }` : redis.image }`,
                 name: `${ prefix }_redis`,
@@ -235,22 +245,18 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     `${ path.join(baseConfig.cacheDir, 'mariadb.cnf') }:/etc/mysql/my.cnf`
                 ],
                 env: {
-                    MARIADB_PORT: 3306,
-                    MARIADB_ROOT_PASSWORD: 'scandipwa',
-                    MARIADB_USER: 'magento',
-                    MARIADB_PASSWORD: 'magento',
-                    MARIADB_DATABASE: 'magento'
+                    MARIADB_ROOT_PASSWORD: 'scandipwa'
                 },
-                command: [
-                    '--log_bin_trust_function_creators=1'
-                ]
-                    .join(' '),
+                command: '--log_bin_trust_function_creators=1',
                 securityOptions: [
                     'seccomp=unconfined'
                 ],
                 network: network.name,
                 image: `${ mariadb.version ? `mariadb:${ mariadb.version }` : mariadb.image }`,
-                name: `${ prefix }_mariadb`
+                name: `${ prefix }_mariadb`,
+                description: `To connect to MariaDB you can use the following users:
+- User ${ logger.style.command('root') } with password ${ logger.style.command('scandipwa') }
+- User ${ logger.style.command(defaultMagentoUser.user) } with password ${ logger.style.command(defaultMagentoUser.password) }`
             },
             elasticsearch: {
                 _: 'ElasticSearch',
@@ -269,11 +275,41 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 network: network.name,
                 image: `${ elasticsearch.version ? `elasticsearch:${ elasticsearch.version }` : elasticsearch.image }`,
                 name: `${ prefix }_elasticsearch`
+            },
+            maildev: {
+                _: 'MailDev',
+                ports: isDockerDesktop ? [
+                    `127.0.0.1:${ ports.maildevWeb }:1080`,
+                    `127.0.0.1:${ ports.maildevSMTP }:1025`
+                ] : [],
+                forwardedPorts: isDockerDesktop ? [
+                    `127.0.0.1:${ ports.maildevWeb }:1080`,
+                    `127.0.0.1:${ ports.maildevSMTP }:1025`
+                ] : [
+                    `127.0.0.1:${ ports.maildevWeb }`,
+                    `127.0.0.1:${ ports.maildevSMTP }`
+                ],
+                mountVolumes: [
+                    `${ volumes.maildev.name }:/tmp/maildev`
+                ],
+                env: {
+                    MAILDEV_SMTP_PORT: isDockerDesktop ? '1025' : ports.maildevSMTP,
+                    MAILDEV_WEB_PORT: isDockerDesktop ? '1080' : ports.maildevWeb,
+                    MAILDEV_MAIL_DIRECTORY: '/tmp/maildev'
+                },
+                name: `${ prefix }_maildev`,
+                network: isDockerDesktop ? network.name : 'host',
+                image: maildev.image,
+                user: !isDockerDesktop ? 'root:root' : '',
+                connectCommand: ['/bin/sh'],
+                healthCheck: {
+                    cmd: `wget -O - http://127.0.0.1:${ isDockerDesktop ? '1080' : ports.maildevWeb }/healthz || exit 1`
+                }
             }
         };
 
-        if (ssl.enabled) {
-            dockerConfig.nginx.ports.push(
+        if (ssl.enabled && isDockerDesktop) {
+            dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             );
         }
@@ -284,13 +320,13 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 image: `${ varnish.version ? `varnish:${ varnish.version }` : varnish.image }`,
                 name: `${ prefix }_varnish`,
                 mountVolumes: [
-                    `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
+                    `${ !isDockerDesktop ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
                 ],
-                ports: isNotNativeLinux ? [
+                ports: isDockerDesktop ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
                 ] : [],
                 forwardedPorts: [
-                    isNotNativeLinux
+                    isDockerDesktop
                         ? `127.0.0.1:${ ports.varnish }:80`
                         : `127.0.0.1:${ ports.varnish }`
                 ],
@@ -298,12 +334,13 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     VARNISH_SIZE: '2G'
                 },
                 restart: 'on-failure:30',
-                network: isNotNativeLinux ? network.name : 'host',
+                network: isDockerDesktop ? network.name : 'host',
                 // eslint-disable-next-line max-len
-                command: `/bin/bash -c "varnishd -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
+                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"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
-                ]
+                ],
+                description: `Varnish HealthCheck status: ${ logger.style.command(varnish.healthCheck ? 'enabled' : 'disabled') }`
             };
         }
 

package/lib/config/get-project-configuration.js

@@ -1,3 +1,4 @@
+const { getProjectConfig } = require('./config');
 const { getConfigFromMagentoVersion } = require('./index');
 
 /**
@@ -8,6 +9,10 @@ const getProjectConfiguration = () => ({
     task: async (ctx) => {
         const { magentoVersion } = ctx;
 
+        if (typeof ctx.debug !== 'boolean') {
+            ctx.debug = getProjectConfig().debug;
+        }
+
         ctx.config = await getConfigFromMagentoVersion(ctx, {
             magentoVersion
         });

package/lib/config/index.js

@@ -9,6 +9,7 @@ const { getMagentoConfig } = require('./magento-config');
 const resolveConfigurationWithOverrides = require('../util/resolve-configuration-with-overrides');
 const { getPrefix, folderName } = require('../util/prefix');
 const UnknownError = require('../errors/unknown-error');
+const { getProjectConfig } = require('./config');
 
 const platforms = ['linux', 'darwin'];
 const darwinMinimalVersion = '10.5';
@@ -33,7 +34,11 @@ const magento = {
 
 module.exports = {
     /**
-     * @param {string} magentoVersion
+     * @param {import('../../typings/context')} ctx
+     * @param {Object} param1
+     * @param {String} [param1.magentoVersion]
+     * @param {String} [param1.projectPath]
+     * @param {String} [param1.prefix]
      */
     async getConfigFromMagentoVersion(ctx, {
         magentoVersion,
@@ -45,6 +50,7 @@ module.exports = {
         if (!configurations[magentoVersion]) {
             throw new UnknownError(`No config found for magento version ${magentoVersion}`);
         }
+        const projectConfig = getProjectConfig();
 
         const {
             overridenConfiguration,
@@ -56,13 +62,14 @@ module.exports = {
         );
 
         return {
-            php: getPhpConfig(overridenConfiguration.configuration, newBaseConfig),
+            php: getPhpConfig(overridenConfiguration, newBaseConfig),
             docker: await getDockerConfig(ctx, overridenConfiguration, newBaseConfig),
             magentoConfiguration: getMagentoConfig(overridenConfiguration.magento),
             baseConfig: newBaseConfig,
             overridenConfiguration,
             userConfiguration,
-            nonOverridenConfiguration: configurations[magentoVersion]
+            nonOverridenConfiguration: configurations[magentoVersion],
+            projectConfig
         };
     },
     baseConfig,

package/lib/config/php/versions/php-7.2.js

@@ -14,6 +14,7 @@ const php72 = ({
     debugImage: `${ baseImage }-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
     extensions: {
         xdebug,
         ...extensions

package/lib/config/php/versions/php-7.3.js

@@ -14,6 +14,7 @@ const php73 = ({
     debugImage: `${ baseImage }-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
     extensions: {
         xdebug,
         ...extensions

package/lib/config/php/versions/php-7.4.js

@@ -14,6 +14,7 @@ const php74 = ({
     debugImage: `${ baseImage }-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
     extensions: {
         xdebug,
         ...extensions

package/lib/config/php/versions/php-8.1.js

@@ -14,6 +14,7 @@ const php81 = ({
     debugImage: `${ baseImage }-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
     extensions: {
         xdebug,
         ...extensions

package/lib/config/php-config.js

@@ -5,17 +5,18 @@ const path = require('path');
  * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
  */
 module.exports = (overridenConfiguration, baseConfig) => {
-    const { php } = overridenConfiguration;
+    const { configuration: { php } } = overridenConfiguration;
 
     const { cacheDir } = baseConfig;
 
     const phpConfiguration = {
         iniPath: path.join(cacheDir, 'php.ini'),
         iniTemplatePath: php.configTemplate,
+        debugIniPath: path.join(cacheDir, 'xdebug.ini'),
+        debugTemplatePath: php.debugTemplate,
         fpmTemplatePath: php.fpmConfigTemplate,
         fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
-        extensions: php.extensions,
-        version: php.version
+        extensions: php.extensions
     };
 
     return phpConfiguration;

package/lib/config/port-config.js

@@ -60,7 +60,9 @@ const defaultPorts = {
     fpm: 9000,
     mariadb: 3306,
     redis: 6379,
-    elasticsearch: 9200
+    elasticsearch: 9200,
+    maildevSMTP: 1025,
+    maildevWeb: 1080
 };
 
 /**

package/lib/config/services/composer/versions/composer-1.js

@@ -0,0 +1,13 @@
+/**
+ * @returns {import('../../../../../typings/index').ComposerConfiguration}
+ */
+const composer1 = () => ({
+    version: '1',
+    plugins: {
+        'hirak/prestissimo': {
+            enabled: true
+        }
+    }
+});
+
+module.exports = composer1;

package/lib/config/services/composer/versions/composer-2.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ComposerConfiguration}
+ */
+const composer2 = () => ({
+    version: '2'
+});
+
+module.exports = composer2;

package/lib/config/services/composer/versions/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+    composer1: require('./composer-1'),
+    composer2: require('./composer-2')
+};

package/lib/config/services/maildev/index.js

@@ -0,0 +1,7 @@
+const maildev = () => ({
+    image: 'maildev/maildev'
+});
+
+module.exports = {
+    maildev
+};

package/lib/config/services/nginx/versions/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    nginx118: require('./nginx-1.18')
+};

package/lib/config/services/nginx/versions/nginx-1.18.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+/**
+ * @returns {import('../../../../../typings/index').NginxConfiguration}
+ */
+const nginx118 = ({ templateDir }) => ({
+    version: '1.18.0',
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+});
+
+module.exports = nginx118;

package/lib/config/{ssl-terminator → services/ssl-terminator}/index.js

@@ -1,5 +1,8 @@
 const path = require('path');
 
+/**
+ * @returns {import('../../../../typings/index').SSLTerminatorConfiguration}
+ */
 const sslTerminator = ({ templateDir }) => ({
     version: '1.18.0',
     configTemplate: path.join(templateDir || '', 'ssl-terminator.template.conf')

package/lib/config/templates/magentorc.template

@@ -1,17 +1,24 @@
 RED='\033[0;31m'
 GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+ORANGE='\033[0;33m'
+BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
-alias php="npm run exec php php"
+alias exec="node ./node_modules/.bin/magento-scripts-exec"
+alias php="exec php php"
 alias magento="php bin/magento"
 alias magneto="echo -e 'Not ${RED}magneto${NC} but ${GREEN}magento${NC} please! or at least ${GREEN}m${NC}!' && magento"
 alias m="magento"
-alias composer="npm run exec php composer"
+alias composer="exec php composer"
 alias c="composer"
 <% if (it.varnishEnabled) { %>
-alias cvc="npm run exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"
+alias cvc="exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"
 <% } %>
-alias mariadb="npm run exec mariadb 'mysql -umagento -pmagento'"
-alias mariadbroot="npm run exec mariadb 'mysql -uroot -pscandipwa'"
+alias mariadb="exec mariadb 'mysql -umagento -pmagento'"
+alias mariadbroot="exec mariadb 'mysql -uroot -pscandipwa'"
 
+# silence warning on macos
 export BASH_SILENCE_DEPRECATION_WARNING=1
+
+export PS1="[${YELLOW}cli${NC}] \w [${YELLOW}<%~ it.magentoVersion %>${NC}] [${GREEN}\t${NC}] \nbash \v: "

package/lib/config/templates/php-debug.template.ini

@@ -0,0 +1,31 @@
+[xdebug]
+error_reporting=E_ALL
+
+xdebug.idekey=PHPSTORM
+
+<% if (it.isXDebug2) { %>
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+
+xdebug.remote_host=<%~ it.hostMachine %>
+
+xdebug.remote_port=9003
+
+xdebug.remote_log=<%~ it.mageRoot %>/var/log/xdebug.log
+
+<% } else { %>
+
+xdebug.mode=debug
+xdebug.client_host=<%~ it.hostMachine %>
+
+xdebug.client_port=9003
+
+; THIS THING WILL BREAK PHP
+; xdebug.start_with_request=yes
+
+xdebug.discover_client_host=false
+xdebug.start_upon_error=yes
+
+xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
+
+<% } %>

package/lib/config/templates/php-fpm.template.conf

@@ -3,6 +3,7 @@ daemonize = no
 log_level = debug
 
 [www]
+clear_env = no
 user = nobody
 ;; Commented because if it is not set, php-fpm will use default group.
 ;; https://www.php.net/manual/en/install.fpm.configuration.php#group
@@ -17,5 +18,3 @@ pm.max_requests = 5000
 pm.process_idle_timeout = 10s
 pm.status_path = /fpmstatus
 listen = <%~ it.port %>
-
-env[PATH] = $PATH