|
@@ -1,7 +1,7 @@
|
|
## Mark Shust's Docker Configuration for Magento
|
|
## Mark Shust's Docker Configuration for Magento
|
|
## (https://github.com/markshust/docker-magento)
|
|
## (https://github.com/markshust/docker-magento)
|
|
##
|
|
##
|
|
-## Version 42.0.0
|
|
|
|
|
|
+## Version 43.0.0
|
|
|
|
|
|
## To use SSH, see https://github.com/markshust/docker-magento#ssh
|
|
## To use SSH, see https://github.com/markshust/docker-magento#ssh
|
|
## Linux users, see https://github.com/markshust/docker-magento#linux
|
|
## Linux users, see https://github.com/markshust/docker-magento#linux
|
|
@@ -25,22 +25,15 @@ services:
|
|
- appdata:/var/www/html
|
|
- appdata:/var/www/html
|
|
- sockdata:/sock
|
|
- sockdata:/sock
|
|
- ssldata:/etc/nginx/certs
|
|
- 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"
|
|
|
|
- - "rabbitmq:172.17.0.1"
|
|
|
|
|
|
+ #extra_hosts: &appextrahosts
|
|
## Selenium support, replace "magento.test" with URL of your site
|
|
## Selenium support, replace "magento.test" with URL of your site
|
|
- - "magento.test:172.17.0.1"
|
|
|
|
|
|
+ #- "magento.test:172.17.0.1"
|
|
|
|
|
|
phpfpm:
|
|
phpfpm:
|
|
- image: markoshust/magento-php:8.1-fpm-0
|
|
|
|
|
|
+ image: markoshust/magento-php:8.1-fpm-1
|
|
volumes: *appvolumes
|
|
volumes: *appvolumes
|
|
- extra_hosts: *appextrahosts
|
|
|
|
env_file: env/phpfpm.env
|
|
env_file: env/phpfpm.env
|
|
|
|
+ #extra_hosts: *appextrahosts
|
|
|
|
|
|
db:
|
|
db:
|
|
image: mariadb:10.4
|
|
image: mariadb:10.4
|
|
@@ -50,13 +43,11 @@ services:
|
|
env_file: env/db.env
|
|
env_file: env/db.env
|
|
volumes:
|
|
volumes:
|
|
- dbdata:/var/lib/mysql
|
|
- dbdata:/var/lib/mysql
|
|
- extra_hosts: *appextrahosts
|
|
|
|
|
|
|
|
redis:
|
|
redis:
|
|
image: redis:6.2-alpine
|
|
image: redis:6.2-alpine
|
|
ports:
|
|
ports:
|
|
- "6379:6379"
|
|
- "6379:6379"
|
|
- extra_hosts: *appextrahosts
|
|
|
|
|
|
|
|
elasticsearch:
|
|
elasticsearch:
|
|
image: markoshust/magento-elasticsearch:7.16-0
|
|
image: markoshust/magento-elasticsearch:7.16-0
|
|
@@ -71,7 +62,6 @@ services:
|
|
## More info at https://github.com/markshust/docker-magento/issues/488
|
|
## More info at https://github.com/markshust/docker-magento/issues/488
|
|
- "cluster.routing.allocation.disk.threshold_enabled=false"
|
|
- "cluster.routing.allocation.disk.threshold_enabled=false"
|
|
- "index.blocks.read_only_allow_delete"
|
|
- "index.blocks.read_only_allow_delete"
|
|
- extra_hosts: *appextrahosts
|
|
|
|
|
|
|
|
rabbitmq:
|
|
rabbitmq:
|
|
image: markoshust/magento-rabbitmq:3.9-0
|
|
image: markoshust/magento-rabbitmq:3.9-0
|
|
@@ -81,13 +71,11 @@ services:
|
|
volumes:
|
|
volumes:
|
|
- rabbitmqdata:/var/lib/rabbitmq
|
|
- rabbitmqdata:/var/lib/rabbitmq
|
|
env_file: env/rabbitmq.env
|
|
env_file: env/rabbitmq.env
|
|
- extra_hosts: *appextrahosts
|
|
|
|
|
|
|
|
mailcatcher:
|
|
mailcatcher:
|
|
image: sj26/mailcatcher
|
|
image: sj26/mailcatcher
|
|
ports:
|
|
ports:
|
|
- "1080:1080"
|
|
- "1080:1080"
|
|
- extra_hosts: *appextrahosts
|
|
|
|
|
|
|
|
## Blackfire support, uncomment to enable
|
|
## Blackfire support, uncomment to enable
|
|
#blackfire:
|
|
#blackfire:
|