|
@@ -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:
|