diff --git a/compose/bin/debug-cli b/compose/bin/debug-cli index d495f98d5..cc867d302 100755 --- a/compose/bin/debug-cli +++ b/compose/bin/debug-cli @@ -1,62 +1,3 @@ -#!/bin/bash -S=$(bin/clinotty cat /usr/local/etc/php/php.ini | grep -iGc 'xdebug.mode = off'); -R=$(grep -c 'XDEBUG_CONFIG=idekey' ./env/phpfpm.env) - -if [[ -z "$2" ]] - then - platform="PHPSTORM" - else - platform=$2 -fi - -local_debug_status(){ - if [[ $R != 0 ]]; then - echo "Cli debug enabled" - else - echo "Cli debug disabled" - fi -} - -local_debug_toggle() { - if [[ $R != 0 ]]; then - local_debug_disable - else - local_debug_enable - fi -} - -local_debug_enable() { - if [[ $S == 1 ]]; then - bin/xdebug enable - fi - - if [[ $R != 0 ]]; then - echo "Already enabled" - exit 0 - fi - - echo "XDEBUG_CONFIG=idekey=$platform" >> ./env/phpfpm.env - sleep 1 - bin/restart phpfpm - echo "Cli debug enabled" -} - -local_debug_disable() { - sed -i '' '/XDEBUG_CONFIG=idekey/d' ./env/phpfpm.env - sleep 1 - bin/restart phpfpm - echo "Cli debug disabled" -} - -firstArgLetter="$(echo "$1" | head -c 1)" -if [[ $firstArgLetter == "d" ]]; then - local_debug_disable -elif [[ $firstArgLetter == "e" ]]; then - local_debug_enable -elif [[ $firstArgLetter == "t" ]]; then - local_debug_toggle -elif [[ $firstArgLetter == "s" ]]; then - local_debug_status -else - printf "Please specify either 'disable', 'enable', 'status' or 'toggle' as mandatory argument.\nSpecify as an optional second argument the platform. Default is PHPSTORM\nEx: bin/debug-cli enable [PHPSTORM]\n" -fi +#!/usr/bin/env bash +[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit +bin/docker-compose exec phpfpm-xdebug "$@" diff --git a/compose/bin/xdebug b/compose/bin/xdebug deleted file mode 100755 index 4307ad90d..000000000 --- a/compose/bin/xdebug +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -current_mode=$(bin/clinotty cat /usr/local/etc/php/php.ini | grep '^xdebug.mode' | cut -d'=' -f2 | tr -d ' ') - -display_modes() { - echo "- off" - echo "- develop" - echo "- coverage" - echo "- debug" - echo "- gcstats" - echo "- profile" - echo "- trace" - echo "" - printf "You can also combine multiple modes with commas (e.g., develop,trace)\n" -} - -xdebug_set_mode() { - local new_mode=$1 - - # Validate the mode(s) - IFS=',' read -ra MODES <<< "$new_mode" - for mode in "${MODES[@]}"; do - case $mode in - off|develop|coverage|debug|gcstats|profile|trace) - continue - ;; - *) - printf "Invalid mode: %s\n\n" "$mode" - echo "Valid modes are:" - display_modes - return 1 - ;; - esac - done - - if [ "$current_mode" = "$new_mode" ]; then - echo "Current setting is already: xdebug.mode = $new_mode" - return 0 - fi - - bin/root sed -i -e "s/^xdebug\.mode.*$/xdebug.mode = $new_mode/g" /usr/local/etc/php/php.ini - bin/cli kill -USR2 1 - echo "New setting: xdebug.mode = $new_mode" -} - -if [ -z "$1" ]; then - printf "Current setting: xdebug.mode = %s\n\n" "$current_mode" - printf "Update it by passing in a valid mode as an argument:\n" - display_modes - exit 1 -fi - -xdebug_set_mode "$1" diff --git a/compose/compose.dev-linux.yaml b/compose/compose.dev-linux.yaml index 13af9b003..413cc9b2b 100644 --- a/compose/compose.dev-linux.yaml +++ b/compose/compose.dev-linux.yaml @@ -5,7 +5,10 @@ services: - ./src:/var/www/html:cached phpfpm: - volumes: *appvolumes + volumes: *appvolumes + + phpfpm-xdebug: + volumes: *appvolumes phpmyadmin: image: linuxserver/phpmyadmin diff --git a/compose/compose.dev-ssh.yaml b/compose/compose.dev-ssh.yaml index c05c72234..974c6c8e3 100644 --- a/compose/compose.dev-ssh.yaml +++ b/compose/compose.dev-ssh.yaml @@ -6,6 +6,9 @@ services: phpfpm: volumes: *appvolumes + phpfpm-xdebug: + volumes: *appvolumes + ssh: image: markoshust/ssh ports: diff --git a/compose/compose.dev.yaml b/compose/compose.dev.yaml index 34b0ef4b8..c9978dc00 100644 --- a/compose/compose.dev.yaml +++ b/compose/compose.dev.yaml @@ -21,6 +21,9 @@ services: phpfpm: volumes: *appvolumes + phpfpm-xdebug: + volumes: *appvolumes + phpmyadmin: image: linuxserver/phpmyadmin env_file: env/db.env diff --git a/compose/compose.healthcheck.yaml b/compose/compose.healthcheck.yaml index ad707bfc8..837965178 100644 --- a/compose/compose.healthcheck.yaml +++ b/compose/compose.healthcheck.yaml @@ -29,6 +29,19 @@ services: #elasticsearch: # condition: service_healthy + phpfpm-xdebug: + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + opensearch: + condition: service_healthy + rabbitmq: + condition: service_healthy + #elasticsearch: + # condition: service_healthy + db: healthcheck: test: "mysqladmin ping -h localhost -u root -pmagento || mariadb-admin ping -h localhost -u root -pmagento" diff --git a/compose/compose.yaml b/compose/compose.yaml index 5ddcfc82e..79902144c 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -12,7 +12,10 @@ services: app: - image: markoshust/magento-nginx:1.24-0 + # image: markoshust/magento-nginx:1.24-0 + build: + context: ./images/nginx/1.24 + dockerfile: Dockerfile ports: - "80:8000" - "443:8443" @@ -30,11 +33,25 @@ services: #- "host.docker.internal:host-gateway" phpfpm: - image: markoshust/magento-php:8.3-fpm-4 + # image: markoshust/magento-php:8.3-fpm-4 + build: + context: ./images/php/8.3 + dockerfile: Dockerfile volumes: *appvolumes env_file: env/phpfpm.env #extra_hosts: *appextrahosts + phpfpm-xdebug: + # image: markoshust/magento-php:8.3-fpm-4 + build: + context: ./images/php/8.3-xdebug + dockerfile: Dockerfile + volumes: *appvolumes + env_file: + - env/phpfpm.env + - env/phpfpm-xdebug.env + #extra_hosts: *appextrahosts + db: image: mariadb:11.4 command: diff --git a/compose/env/phpfpm-xdebug.env b/compose/env/phpfpm-xdebug.env new file mode 100644 index 000000000..e1c72b2e1 --- /dev/null +++ b/compose/env/phpfpm-xdebug.env @@ -0,0 +1,2 @@ +PHP_IDE_CONFIG="serverName=docker-magento" +XDEBUG_MODE=develop,debug \ No newline at end of file diff --git a/compose/env/phpfpm.env b/compose/env/phpfpm.env index 8d8d626d7..ed1602614 100644 --- a/compose/env/phpfpm.env +++ b/compose/env/phpfpm.env @@ -2,4 +2,4 @@ BLACKFIRE_CLIENT_ID= BLACKFIRE_CLIENT_TOKEN= COMPOSER_DISABLE_XDEBUG_WARN=1 PHP_CS_FIXER_IGNORE_ENV=1 -PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true +PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ No newline at end of file diff --git a/images/nginx/1.24/conf/default.conf b/images/nginx/1.24/conf/default.conf index d579cd850..9da65c103 100644 --- a/images/nginx/1.24/conf/default.conf +++ b/images/nginx/1.24/conf/default.conf @@ -1,5 +1,14 @@ -upstream fastcgi_backend { - server unix:/sock/docker.sock; +upstream fastcgi_phpfpm { + server unix:/sock/phpfpm.sock; +} + +upstream fastcgi_phpfpm_xdebug { + server unix:/sock/phpfpm-xdebug.sock; +} + +map $cookie_XDEBUG_SESSION $fastcgi_backend { + default fastcgi_phpfpm; + PHPSTORM fastcgi_phpfpm_xdebug; } server { diff --git a/images/php/8.3-xdebug/Dockerfile b/images/php/8.3-xdebug/Dockerfile new file mode 100644 index 000000000..1f003209d --- /dev/null +++ b/images/php/8.3-xdebug/Dockerfile @@ -0,0 +1,111 @@ +FROM php:8.3-fpm-bookworm +LABEL maintainer="Mark Shust " + +ARG APP_ID=1000 +RUN groupadd -g "$APP_ID" app \ + && useradd -g "$APP_ID" -u "$APP_ID" -d /var/www -s /bin/bash app + +RUN mkdir -p /etc/nginx/html /var/www/html /sock \ + && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock + +RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - + +RUN apt-get update && apt-get install -y \ + cron \ + default-mysql-client \ + git \ + gnupg \ + gzip \ + libbz2-dev \ + libfreetype6-dev \ + libicu-dev \ + libjpeg62-turbo-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libonig-dev \ + libpng-dev \ + libsodium-dev \ + libssh2-1-dev \ + libwebp-dev \ + libxslt1-dev \ + libzip-dev \ + lsof \ + mailutils \ + msmtp \ + nodejs \ + procps \ + rsync \ + strace \ + vim \ + zip \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net && pecl install \ + redis-6.2.0 \ + ssh2-1.4.1 \ + swoole-6.0.2 \ + xdebug-3.4.2 \ + imagick-3.8.0RC2 \ + && pecl clear-cache \ + && rm -rf /tmp/pear + +RUN docker-php-ext-configure \ + gd --with-freetype --with-jpeg --with-webp \ + && docker-php-ext-install \ + bcmath \ + bz2 \ + calendar \ + exif \ + ftp \ + gd \ + gettext \ + intl \ + mbstring \ + mysqli \ + opcache \ + pcntl \ + pdo_mysql \ + soap \ + sockets \ + sodium \ + sysvmsg \ + sysvsem \ + sysvshm \ + xsl \ + zip \ + && docker-php-ext-enable \ + imagick \ + redis \ + ssh2 \ + xdebug + +RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ + && architecture=$(uname -m) \ + && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/$architecture/$version \ + && mkdir -p /tmp/blackfire \ + && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \ + && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ + && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz + +RUN git clone --branch v0.4.18 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \ + && cd /usr/lib/php-spx \ + && phpize \ + && ./configure \ + && make \ + && make install + +RUN curl -sS https://getcomposer.org/installer | \ + php -- --version=2.8.6 --install-dir=/usr/local/bin --filename=composer + +COPY conf/blackfire.ini $PHP_INI_DIR/conf.d/blackfire.ini +COPY conf/spx.ini $PHP_INI_DIR/conf.d/spx.ini +COPY conf/msmtprc /etc/msmtprc +COPY conf/php.ini $PHP_INI_DIR +COPY conf/php-xdebug.ini $PHP_INI_DIR/conf.d/ +COPY conf/php-fpm.conf /usr/local/etc/ +COPY conf/www.conf /usr/local/etc/php-fpm.d/ + +USER app:app +VOLUME /var/www +WORKDIR /var/www/html diff --git a/images/php/8.3-xdebug/conf/blackfire.ini b/images/php/8.3-xdebug/conf/blackfire.ini new file mode 100644 index 000000000..86b377f66 --- /dev/null +++ b/images/php/8.3-xdebug/conf/blackfire.ini @@ -0,0 +1,2 @@ +extension=blackfire.so +blackfire.agent_socket=tcp://blackfire:8307 diff --git a/images/php/8.3-xdebug/conf/msmtprc b/images/php/8.3-xdebug/conf/msmtprc new file mode 100644 index 000000000..84837e17c --- /dev/null +++ b/images/php/8.3-xdebug/conf/msmtprc @@ -0,0 +1,4 @@ +account default +host mailcatcher +port 1025 +from "user@domain.com" diff --git a/images/php/8.3-xdebug/conf/php-fpm.conf b/images/php/8.3-xdebug/conf/php-fpm.conf new file mode 100644 index 000000000..e4468d80c --- /dev/null +++ b/images/php/8.3-xdebug/conf/php-fpm.conf @@ -0,0 +1,34 @@ +; This file was initially adapted from the output of: (on PHP 5.6) +; grep -vE '^;|^ *$' /usr/local/etc/php-fpm.conf.default + +[global] + +error_log = /proc/self/fd/2 +daemonize = no + +[www] + +; if we send this to /proc/self/fd/1, it never appears +access.log = /proc/self/fd/2 + +;user = app +;group = app + +listen = /sock/phpfpm-xdebug.sock +listen.owner = app +listen.group = app +listen.mode = 0660 + +pm = dynamic +pm.max_children = 10 +pm.start_servers = 4 +pm.min_spare_servers = 2 +pm.max_spare_servers = 6 + +clear_env = no + +; Ensure worker stdout and stderr are sent to the main error log. +catch_workers_output = yes + +; This needed to make PHP-SPX work in fpm mode. +process.dumpable = yes diff --git a/images/php/8.3-xdebug/conf/php-xdebug.ini b/images/php/8.3-xdebug/conf/php-xdebug.ini new file mode 100644 index 000000000..cd08bdf57 --- /dev/null +++ b/images/php/8.3-xdebug/conf/php-xdebug.ini @@ -0,0 +1,6 @@ +xdebug.mode = ${XDEBUG_MODE} +xdebug.client_host = host.docker.internal +xdebug.client_port = 9003 +xdebug.start_with_request = yes +xdebug.output_dir = /var/www/html/var/profile +xdebug.profiler_output_name = cachegrind.out.%t.%p diff --git a/images/php/8.3-xdebug/conf/php.ini b/images/php/8.3-xdebug/conf/php.ini new file mode 100644 index 000000000..515eaf6a4 --- /dev/null +++ b/images/php/8.3-xdebug/conf/php.ini @@ -0,0 +1,11 @@ +memory_limit = 4G +max_execution_time = 1800 +zlib.output_compression = 1 +cgi.fix_pathinfo = 0 +date.timezone = UTC + +upload_max_filesize = 100M +post_max_size = 100M +max_input_vars = 10000 + +sendmail_path = "/usr/bin/msmtp -t" diff --git a/images/php/8.3-xdebug/conf/spx.ini b/images/php/8.3-xdebug/conf/spx.ini new file mode 100644 index 000000000..7422bfa9e --- /dev/null +++ b/images/php/8.3-xdebug/conf/spx.ini @@ -0,0 +1,5 @@ +extension = /usr/lib/php-spx/modules/spx.so +spx.http_enabled = 1 +spx.http_key = "dev" +spx.http_ip_whitelist = "*" +spx.data_dir = /var/www/spx_dumps diff --git a/images/php/8.3-xdebug/conf/www.conf b/images/php/8.3-xdebug/conf/www.conf new file mode 100644 index 000000000..af0053704 --- /dev/null +++ b/images/php/8.3-xdebug/conf/www.conf @@ -0,0 +1,413 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or NONE) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = app +group = app + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 5 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: /usr/local/share/php/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/local) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/images/php/8.3/Dockerfile b/images/php/8.3/Dockerfile index e3bcee253..f247860c2 100644 --- a/images/php/8.3/Dockerfile +++ b/images/php/8.3/Dockerfile @@ -45,7 +45,6 @@ RUN pecl channel-update pecl.php.net && pecl install \ redis-6.2.0 \ ssh2-1.4.1 \ swoole-6.0.2 \ - xdebug-3.4.2 \ imagick-3.8.0RC2 \ && pecl clear-cache \ && rm -rf /tmp/pear @@ -77,8 +76,7 @@ RUN docker-php-ext-configure \ && docker-php-ext-enable \ imagick \ redis \ - ssh2 \ - xdebug + ssh2 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ && architecture=$(uname -m) \ diff --git a/images/php/8.3/conf/php-fpm.conf b/images/php/8.3/conf/php-fpm.conf index 455c1a2f1..365fe324d 100644 --- a/images/php/8.3/conf/php-fpm.conf +++ b/images/php/8.3/conf/php-fpm.conf @@ -14,7 +14,7 @@ access.log = /proc/self/fd/2 ;user = app ;group = app -listen = /sock/docker.sock +listen = /sock/phpfpm.sock listen.owner = app listen.group = app listen.mode = 0660 diff --git a/images/php/8.3/conf/php.ini b/images/php/8.3/conf/php.ini index 3bfeaec4e..515eaf6a4 100644 --- a/images/php/8.3/conf/php.ini +++ b/images/php/8.3/conf/php.ini @@ -4,13 +4,6 @@ zlib.output_compression = 1 cgi.fix_pathinfo = 0 date.timezone = UTC -xdebug.mode = off -xdebug.client_host = host.docker.internal -xdebug.idekey = PHPSTORM -xdebug.start_with_request = trigger -xdebug.output_dir = /var/www/html/var/profile -xdebug.profiler_output_name = cachegrind.out.%t.%p - upload_max_filesize = 100M post_max_size = 100M max_input_vars = 10000 diff --git a/lib/onelinesetup b/lib/onelinesetup index da9399cbb..04a9bffd8 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -5,7 +5,8 @@ DOMAIN=${1:-magento.test} EDITION=${2} VERSION=${3} -curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash +# curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash +curl -s https://raw.githubusercontent.com/Jarzebowsky/docker-magento/xdebug-change-trigger-method/lib/template | bash # &&'s are used below otherwise onelinesetup script fails/errors after bin/download # ${:+""} format only includes parameters if they were explicitly set diff --git a/lib/template b/lib/template index ea47a4ba9..d52ff163b 100755 --- a/lib/template +++ b/lib/template @@ -6,13 +6,16 @@ if [ -d "./bin" ]; then fi git init -qqq -git remote add origin https://github.com/markshust/docker-magento +# git remote add origin https://github.com/markshust/docker-magento +git remote add origin https://github.com/Jarzebowsky/docker-magento git fetch origin -qqq -git checkout origin/master -- compose +# git checkout origin/master -- compose +git checkout origin/xdebug-change-trigger-method -- compose images mv compose/* ./ mv compose/.gitignore ./ mv compose/.vscode ./ +mv images/* ./images rm -rf compose .git git init