Fix delays on Apple Silicone and elasticsearch timeouts #566 #442

CHANGELOG.md

@@ -8,11 +8,29 @@ 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.1.0] - 2021-10-29
+## [41.0.0] - 2021-11-08
+
+There has been an ongoing issue with Docker for Mac + M1 chips (Apple Silicon) which causes a 5-second delay in network requests (see [#5626](https://github.com/docker/for-mac/issues/5626)). A fix has been implemented in this release that works around this issue, adding `extra_hosts` directives in the `docker-compose.yml` file. This update should be backwards-compatible, but will break existing setups that use custom Docker networks (this is an uncommon scenario). See notes at the top of `docker-compose.yml` for how to configure this project for custom Docker networks.
 
 ### Added
 - Added Imagick PHP extension [#530](https://github.com/markshust/docker-magento/issues/530).
 
+### Fixed
+- Fixed issue with onelinesetup script failing on download [92b803c](https://github.com/markshust/docker-magento/commit/92b803c) [67c76b4](https://github.com/markshust/docker-magento/commit/67c76b4).
+- Fix Shellcheck failures for bin/setup-ssl-ca [#558](https://github.com/markshust/docker-magento/issues/558).
+- Fix wrong `sendmail_path` in php.ini [#556](https://github.com/markshust/docker-magento/issues/556).
+- Ensure .composer directory isn't created by root [#562](https://github.com/markshust/docker-magento/issues/562).
+- Fixed `bin/devconsole` command not working [646f617](https://github.com/markshust/docker-magento/commit/646f617).
+- Fixed `bin/setup-composer-auth` does not persist auth creds [#567](https://github.com/markshust/docker-magento/issues/567).
+- Fixed documentation around Xdebug port on Linux [90af7fa](https://github.com/markshust/docker-magento/commit/90af7fa).
+- Fixed waiting for Elasticsearch/RabbitMQ connection on Mac [#442](https://github.com/markshust/docker-magento/issues/442).
+
+### Updated
+- Updated info about MySQL backups and existing projects in README [86faa70](https://github.com/markshust/docker-magento/commit/86faa70).
+- Updated README for Xdebug + PhpStorm [b1fe812](https://github.com/markshust/docker-magento/commit/b1fe812).
+
+## [40.1.0] - 2021-10-29
+
 ### Fixed
 - Fixed issues with onelinesetup script [#564](https://github.com/markshust/docker-magento/issues/564).
 - Fixed Shellcheck failures for bin/setup-ssl-ca [#558](https://github.com/markshust/docker-magento/issues/558).

compose/docker-compose.dev-linux.yml

@@ -8,7 +8,3 @@ services:
 
   phpfpm:
     volumes: *appvolumes
-    ## Replace 172.17.0.1 with the result of:
-    ## docker run --rm alpine ip route | awk 'NR==1 {print $3}'
-    extra_hosts:
-      - "host.docker.internal:172.17.0.1"

compose/docker-compose.dev-ssh.yml

@@ -5,6 +5,9 @@ services:
     volumes: &appvolumes
       - ./src/nginx.conf.sample:/var/www/html/nginx.conf:cached
 
+  phpfpm:
+    volumes: *appvolumes
+
   ssh:
     image: markoshust/ssh
     ports:

compose/docker-compose.yml

@@ -1,11 +1,15 @@
 ## Mark Shust's Docker Configuration for Magento
 ## (https://github.com/markshust/docker-magento)
 ##
-## Version 40.1.0
+## Version 41.0.0
 
 ## To use SSH, see https://github.com/markshust/docker-magento#ssh
 ## Linux users, see https://github.com/markshust/docker-magento#linux
 
+## If you changed the default Docker network, you may need to replace
+## 172.17.0.1 in this file with the result of:
+## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
+
 version: "3"
 
 services:
@@ -24,18 +28,22 @@ services:
       - appdata:/var/www/html
       - sockdata:/sock
       - ssldata:/etc/nginx/certs
+    extra_hosts: &appextrahosts
+      ## M1 Mac support to fix Docker delay, see #566
+      - "app:172.17.0.1"
+      - "phpfpm:172.17.0.1"
+      - "db:172.17.0.1"
+      - "redis:172.17.0.1"
+      - "elasticsearch:172.17.0.1"
+      ## Selenium support, replace "magento.test" with URL of your site
+      - "magento.test:172.17.0.1"
 
   phpfpm:
-    image: markoshust/magento-php:7.4-fpm-10
+    image: markoshust/magento-php:7.4-fpm-11
     links:
       - db
     volumes: *appvolumes
-    ## extra_hosts is required for selenium
-    ## For extra_hosts, replace "magento.test" with the URL of your site,
-    ## and also replace 172.17.0.1 with the result of:
-    ## docker run --rm alpine ip route | awk 'NR==1 {print $3}'
-    #extra_hosts:
-    #  - "magento.test:172.17.0.1"
+    extra_hosts: *appextrahosts
 
   db:
     image: mariadb:10.4
@@ -45,9 +53,13 @@ services:
     env_file: env/db.env
     volumes:
       - dbdata:/var/lib/mysql
+    extra_hosts: *appextrahosts
 
   redis:
     image: redis:5.0-alpine
+    ports:
+      - "6379:6379"
+    extra_hosts: *appextrahosts
 
   elasticsearch:
     image: markoshust/magento-elasticsearch:7.9.3-1
@@ -62,6 +74,7 @@ services:
       ## More info at https://github.com/markshust/docker-magento/issues/488
       - "cluster.routing.allocation.disk.threshold_enabled=false"
       - "index.blocks.read_only_allow_delete"
+    extra_hosts: *appextrahosts
 
   rabbitmq:
     image: rabbitmq:3.8.22-management-alpine
@@ -72,24 +85,22 @@ services:
       - rabbitmqdata:/var/lib/rabbitmq
     environment:
       - RABBITMQ_VM_MEMORY_HIGH_WATERMARK=1GB
+    extra_hosts: *appextrahosts
 
   mailcatcher:
     image: sj26/mailcatcher
     ports:
       - "1080:1080"
+    extra_hosts: *appextrahosts
 
-  ## Disabling selenium by default as it is not required for all use cases.
-  ## For extra_hosts, replace "magento.test" with the URL of your site,
-  ## and also replace 172.17.0.1 with the result of:
-  ## docker run --rm alpine ip route | awk 'NR==1 {print $3}'
+  ## Selenium support, uncomment to enable
   #selenium:
   #  image: selenium/standalone-chrome-debug:3.8.1
   #  ports:
   #    - "5900:5900"
   #  links:
   #    - app
-  #  extra_hosts:
-  #    - "magento.test:172.17.0.1"
+  #  extra_hosts: *appextrahosts
 
 volumes:
   appdata: