Merge branch 'acs-frontend' into acs-frontend-persist

This commit is contained in:
Brian Long 2021-07-30 16:18:14 -04:00
commit ff441fc4d6

View File

@ -49,6 +49,7 @@ services:
transform-core-aio: transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.6 image: alfresco/alfresco-transform-core-aio:2.3.6
mem_limit: 1g
share: share:
image: alfresco/alfresco-share:6.2.2 image: alfresco/alfresco-share:6.2.2
@ -68,7 +69,7 @@ services:
postgres-acs: postgres-acs:
image: postgres:11.7 image: postgres:11.7
mem_limit: 512m mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@ -79,7 +80,7 @@ services:
search: search:
image: alfresco/alfresco-search-services:2.0.1 image: alfresco/alfresco-search-services:2.0.1
mem_limit: 2g mem_limit: 1g
environment: environment:
- SOLR_ALFRESCO_HOST=platform - SOLR_ALFRESCO_HOST=platform
- SOLR_ALFRESCO_PORT=8080 - SOLR_ALFRESCO_PORT=8080
@ -92,13 +93,14 @@ services:
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m mem_limit: 512m
volumes: volumes:
- activemq-volume:/opt/activemq/data:rw - activemq-volume:/opt/activemq/data:rw
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs-share image: local/nginx-ingress:acs-share
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: