|
@@ -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 40.0.1
|
|
|
|
|
|
+## Version 40.0.2
|
|
|
|
|
|
## 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,17 +25,17 @@ services:
|
|
- sockdata:/sock
|
|
- sockdata:/sock
|
|
- ssldata:/etc/nginx/certs
|
|
- ssldata:/etc/nginx/certs
|
|
|
|
|
|
- ## 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}'
|
|
|
|
phpfpm:
|
|
phpfpm:
|
|
image: markoshust/magento-php:7.4-fpm-10
|
|
image: markoshust/magento-php:7.4-fpm-10
|
|
links:
|
|
links:
|
|
- db
|
|
- db
|
|
volumes: *appvolumes
|
|
volumes: *appvolumes
|
|
- # extra_hosts:
|
|
|
|
- # - "magento.test:172.17.0.1"
|
|
|
|
|
|
+ ## 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"
|
|
|
|
|
|
db:
|
|
db:
|
|
image: mariadb:10.4
|
|
image: mariadb:10.4
|