Merge branch 'acs-enterprise' into acs-ats-enterprise

This commit is contained in:
Brian Long 2021-07-30 15:59:59 -04:00
commit 874f04c305

View File

@ -71,7 +71,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
@ -80,11 +80,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 image: local/nginx-ingress:acs
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: