Merge branch 'acs' into acs-mysql

This commit is contained in:
Brian Long 2021-07-30 15:58:15 -04:00
commit c5171fdb51

View File

@ -45,11 +45,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: