50.0.0 (#1286)

.github/workflows/build-php-8-1.yml

@@ -33,4 +33,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.1-fpm
-            markoshust/magento-php:8.1-fpm-6
+            markoshust/magento-php:8.1-fpm-7

.github/workflows/build-php-8-2.yml

@@ -33,4 +33,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.2-fpm
-            markoshust/magento-php:8.2-fpm-5
+            markoshust/magento-php:8.2-fpm-6

.github/workflows/build-php-8-3.yml

@@ -33,4 +33,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.3-fpm
-            markoshust/magento-php:8.3-fpm-3
+            markoshust/magento-php:8.3-fpm-4

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [50.0.0] - 2024-01-31
+
+### Added
+- Added `generated` and `var` folders as mounted directories in `compose.dev.yaml` for easier debugging [PR #1284](https://github.com/markshust/docker-magento/pull/1284)
+- Added options to `php.ini` to allow for automatic Xdebug profiling [PR #1284](https://github.com/markshust/docker-magento/pull/1284)
+
+### Updated
+- Mailcatcher tagged to version 0.10.0 [PR #912](https://github.com/markshust/docker-magento/pull/912)
+- Xdebug to version 3.4.1 [PR #1285](https://github.com/markshust/docker-magento/pull/1285)
+- Swoole to version 6.0.0 [PR #1285](https://github.com/markshust/docker-magento/pull/1285)
+
 ## [49.0.0] - 2024-01-15
 
 ### Updated

README.md

@@ -33,9 +33,9 @@ View Dockerfiles for the latest tags:
   - [`1.22`, `1.22-0`](images/nginx/1.22)
   - [`1.24`, `1.24-0`](images/nginx/1.24)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
-  - [`8.1-fpm`, `8.1-fpm-6`](images/php/8.1)
-  - [`8.2-fpm`, `8.2-fpm-5`](images/php/8.2)
-  - [`8.3-fpm`, `8.3-fpm-3`](images/php/8.3)
+  - [`8.1-fpm`, `8.1-fpm-7`](images/php/8.1)
+  - [`8.2-fpm`, `8.2-fpm-6`](images/php/8.2)
+  - [`8.3-fpm`, `8.3-fpm-4`](images/php/8.3)
   - [`8.4-fpm-dev`](images/php/8.4)
 - [markoshust/magento-opensearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-opensearch/)
   - [`1.2`, `1.2-0`](images/opensearch/1.2)

compose/compose.dev.yaml

@@ -12,11 +12,11 @@ services:
       - ./src/dev/tools/grunt/configs:/var/www/html/dev/tools/grunt/configs:cached
       - ./src/nginx.conf.sample:/var/www/html/nginx.conf:cached
       - ./src/package.json.sample:/var/www/html/package.json:cached
+      - ./src/generated:/var/www/html/generated:cached
+      - ./src/var:/var/www/html/var:cached
       #- ./src/auth.json:/var/www/html/auth.json:cached
       #- ./src/m2-hotfixes:/var/www/html/m2-hotfixes:cached
       #- ./src/patches:/var/www/html/patches:cached
-      #- ./src/var/log:/var/www/html/var/log:cached
-      #- ./src/var/report:/var/www/html/var/report:cached
 
   phpfpm:
     volumes: *appvolumes

compose/compose.yaml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 49.0.0
+## Version 50.0.0
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux
@@ -30,7 +30,7 @@ services:
       #- "host.docker.internal:host-gateway"
 
   phpfpm:
-    image: markoshust/magento-php:8.3-fpm-3
+    image: markoshust/magento-php:8.3-fpm-4
     volumes: *appvolumes
     env_file: env/phpfpm.env
     #extra_hosts: *appextrahosts

images/php/8.1/Dockerfile

@@ -44,8 +44,8 @@ RUN apt-get update && apt-get install -y \
 RUN pecl channel-update pecl.php.net && pecl install \
     redis-6.1.0 \
     ssh2-1.4.1 \
-    swoole-5.1.5 \
-    xdebug-3.3.2 \
+    swoole-6.0.0 \
+    xdebug-3.4.1 \
   && pecl clear-cache \
   && rm -rf /tmp/pear
 

images/php/8.1/conf/php.ini

@@ -7,6 +7,9 @@ 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

images/php/8.2/Dockerfile

@@ -41,20 +41,11 @@ RUN apt-get update && apt-get install -y \
     zlib1g-dev \
   && rm -rf /var/lib/apt/lists/*
 
-#RUN pecl channel-update pecl.php.net && pecl install \
-#    imagick-3.7.0 \
-#    redis-6.0.2 \
-#    ssh2-1.3.1 \
-#    swoole-5.1.1 \
-#    xdebug-3.2.2 \
-#  && pecl clear-cache \
-#  && rm -rf /tmp/pear
-
 RUN pecl channel-update pecl.php.net && pecl install \
     redis-6.1.0 \
     ssh2-1.4.1 \
-    swoole-5.1.5 \
-    xdebug-3.3.2 \
+    swoole-6.0.0 \
+    xdebug-3.4.1 \
   && pecl clear-cache \
   && rm -rf /tmp/pear
 

images/php/8.2/conf/php.ini

@@ -7,6 +7,9 @@ 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

images/php/8.3/Dockerfile

@@ -44,8 +44,8 @@ RUN apt-get update && apt-get install -y \
 RUN pecl channel-update pecl.php.net && pecl install \
     redis-6.1.0 \
     ssh2-1.4.1 \
-    swoole-5.1.5 \
-    xdebug-3.3.2 \
+    swoole-6.0.0 \
+    xdebug-3.4.1 \
   && pecl clear-cache \
   && rm -rf /tmp/pear
 

images/php/8.3/conf/php.ini

@@ -7,6 +7,9 @@ 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

images/php/8.4/Dockerfile

@@ -41,13 +41,13 @@ RUN apt-get update && apt-get install -y \
     zlib1g-dev \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pecl channel-update pecl.php.net \
-    && pecl install redis-6.1.0 \
-    && pecl install ssh2-1.4.1 \
-    && pecl install swoole-6.0.0RC1 \
-    && pecl install xdebug-3.4.0beta1 \
-    && pecl clear-cache \
-    && rm -rf /tmp/pear
+RUN pecl channel-update pecl.php.net && pecl install \
+    redis-6.1.0 \
+    ssh2-1.4.1 \
+    swoole-6.0.0 \
+    xdebug-3.4.1 \
+  && pecl clear-cache \
+  && rm -rf /tmp/pear
 
 RUN imagick_branch="28f27044e435a2b203e32675e942eb8de620ee58" \
     && curl -L https://github.com/Imagick/imagick/archive/$imagick_branch.zip -o imagick.zip \

images/php/8.4/conf/php.ini

@@ -7,6 +7,9 @@ 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