Fixed PHP image `8.0-fpm-develop` for Magento 2.4.4 support

CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - PHP image `8.0-fpm-develop` now available for testing purposes.
 
+## [40.0.1] - 2021-10-20
+
+### Fixed
+- Fixed PHP image `8.0-fpm-develop` for Magento 2.4.4 support (note: still has `-develop` tag).
+
+### Updated
+- Moved `~/.ssh` volume mount references to `docker-compose.yml` to ease maintenance.
+
 ## [40.0.0] - 2021-10-15
 
 This is one of the biggest releases of docker-magento 💥! This major update includes support for Apple Silicon (M1/M1X) chips, as well as SSH support for fullly native filesystem speed.

README.md

@@ -187,6 +187,7 @@ bin/download 2.4.3-p1
 # bin/setup-composer-auth
 # bin/cli git clone git@github.com:magento/magento2.git .
 # bin/cli git checkout 2.4-develop
+# bin/composer install
 
 # Run the setup installer for Magento:
 bin/setup magento.test

compose/docker-compose.dev-linux.yml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 40.0.0
+## Version 40.0.1
 
 version: "3"
 
@@ -10,8 +10,6 @@ services:
     volumes: &appvolumes
       - ./src/nginx.conf.sample:/var/www/html/nginx.conf:cached
       - ./src:/var/www/html:cached
-      ## To sync your SSH key to the container, uncomment:
-      #- ~/.ssh/id_rsa:/var/www/.ssh/id_rsa:cached
 
   phpfpm:
     volumes: *appvolumes

compose/docker-compose.dev-ssh.yml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 40.0.0
+## Version 40.0.1
 
 version: "3"
 
@@ -9,8 +9,6 @@ services:
   app:
     volumes: &appvolumes
       - ./src/nginx.conf.sample:/var/www/html/nginx.conf:cached
-      ## To sync your SSH key to the container, uncomment:
-      #- ~/.ssh/id_rsa:/var/www/.ssh/id_rsa:cached
 
   ssh:
     image: markoshust/ssh

compose/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 40.0.0
+## Version 40.0.1
 
 version: "3"
 
@@ -20,8 +20,6 @@ services:
       #- ./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
-      ## To sync your SSH key to the container, uncomment:
-      #- ~/.ssh/id_rsa:/var/www/.ssh/id_rsa:cached
 
   phpfpm:
     volumes: *appvolumes

compose/docker-compose.yml

@@ -1,7 +1,7 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 40.0.0
+## Version 40.0.1
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux
@@ -19,6 +19,8 @@ services:
       - phpfpm
     volumes: &appvolumes
       - ~/.composer:/var/www/.composer:cached
+      - ~/.ssh/id_rsa:/var/www/.ssh/id_rsa:cached
+      - ~/.ssh/known_hosts:/var/www/.ssh/known_hosts:cached
       - appdata:/var/www/html
       - sockdata:/sock
       - ssldata:/etc/nginx/certs

images/php/8.0/Dockerfile

@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y \
   libonig-dev \
   libpng-dev \
   libsodium-dev \
+  libssh2-1-dev \
   libxslt1-dev \
   libzip-dev \
   lsof \
@@ -51,6 +52,9 @@ RUN pecl channel-update pecl.php.net \
   && pecl install xdebug \
   && docker-php-ext-enable xdebug
 
+RUN pecl install ssh2-1.3.1 \
+  && docker-php-ext-enable ssh2
+
 RUN pecl install redis \
   && docker-php-ext-enable redis
 

images/php/8.0/conf/php.ini

@@ -4,10 +4,8 @@ zlib.output_compression = On
 cgi.fix_pathinfo = 0
 date.timezone = UTC
 
-xdebug.remote_autostart = 1
-xdebug.remote_enable = 1
-xdebug.remote_host = host.docker.internal
-xdebug.remote_port = 9001
+xdebug.mode = off
+xdebug.client_host = host.docker.internal
 xdebug.idekey = PHPSTORM
 
 upload_max_filesize = 100M