Merge branch 'acs-backend' into acs-frontend

This commit is contained in:
Brian Long 2021-07-30 16:15:19 -04:00
commit 8c7e433358

View File

@ -47,6 +47,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
@ -66,7 +67,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
@ -75,7 +76,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
@ -86,11 +87,12 @@ services:
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m mem_limit: 512m
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: