Merge branch 'aps' into aps-persist

docker-compose.yml

@@ -42,7 +42,7 @@ services:
     
     postgres-aps:
         image: postgres:11.6
-        mem_limit: 256m
+        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
@@ -80,6 +80,7 @@ services:
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:aps
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: