|
@@ -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 46.1.1
|
|
|
|
|
|
+## Version 47.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
|
|
@@ -10,8 +10,6 @@
|
|
## 172.17.0.1 in this file with the result of:
|
|
## 172.17.0.1 in this file with the result of:
|
|
## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
|
|
## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
|
|
|
|
|
|
-version: "3"
|
|
|
|
-
|
|
|
|
services:
|
|
services:
|
|
app:
|
|
app:
|
|
image: markoshust/magento-nginx:1.24-0
|
|
image: markoshust/magento-nginx:1.24-0
|
|
@@ -80,8 +78,10 @@ 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"
|
|
- ## Uncomment the following line to increase the virtual memory map count
|
|
|
|
- # - "max_map_count=262144"
|
|
|
|
|
|
+ ## Uncomment to set custom heap size to avoid memory errors
|
|
|
|
+ #- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
|
|
|
|
+ ## Uncomment to increase the virtual memory map count
|
|
|
|
+ #- "max_map_count=262144"
|
|
|
|
|
|
## If you wish to use Elasticsearch, comment out opensearch image above and
|
|
## If you wish to use Elasticsearch, comment out opensearch image above and
|
|
## uncomment this block. Do the same in the composer.healthcheck.yaml file.
|
|
## uncomment this block. Do the same in the composer.healthcheck.yaml file.
|
|
@@ -100,8 +100,10 @@ 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"
|
|
- # ## Uncomment the following line to increase the virtual memory map count
|
|
|
|
- # - "max_map_count=262144"
|
|
|
|
|
|
+ # ## Uncomment to set custom heap size to avoid memory errors
|
|
|
|
+ # #- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
|
|
|
|
+ # ## Uncomment to increase the virtual memory map count
|
|
|
|
+ # #- "max_map_count=262144"
|
|
|
|
|
|
rabbitmq:
|
|
rabbitmq:
|
|
image: markoshust/magento-rabbitmq:3.12-0
|
|
image: markoshust/magento-rabbitmq:3.12-0
|
|
@@ -116,14 +118,14 @@ services:
|
|
image: sj26/mailcatcher
|
|
image: sj26/mailcatcher
|
|
ports:
|
|
ports:
|
|
- "1080:1080"
|
|
- "1080:1080"
|
|
-
|
|
|
|
|
|
+
|
|
## Cloudflare tunnel support, uncomment to enable
|
|
## Cloudflare tunnel support, uncomment to enable
|
|
#tunnel:
|
|
#tunnel:
|
|
# container_name: cloudflared-tunnel
|
|
# container_name: cloudflared-tunnel
|
|
# image: cloudflare/cloudflared:latest
|
|
# image: cloudflare/cloudflared:latest
|
|
# command: tunnel run
|
|
# command: tunnel run
|
|
# env_file: env/cloudflare.env
|
|
# env_file: env/cloudflare.env
|
|
-
|
|
|
|
|
|
+
|
|
## Blackfire support, uncomment to enable
|
|
## Blackfire support, uncomment to enable
|
|
#blackfire:
|
|
#blackfire:
|
|
# image: blackfire/blackfire:2
|
|
# image: blackfire/blackfire:2
|