Merge branch 'acs' into ags

docker-compose.yml

@@ -36,7 +36,7 @@ services:
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -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: