Merge branch 'acs' into acs-enterprise

This commit is contained in:
Brian Long 2021-07-30 15:54:12 -04:00
commit ad948f3f08

View File

@ -38,7 +38,7 @@ services:
postgres-acs:
image: postgres:11.7
mem_limit: 512m
mem_limit: 128m
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
@ -47,11 +47,12 @@ services:
activemq:
image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m
mem_limit: 512m
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs
mem_limit: 256m
ports:
- 8080:8080
depends_on: