Merge branch 'acs-community.acs-base' into acs-search-community.acs-community

docker-compose.yml

@@ -4,7 +4,7 @@
 version: "2"
 
 services:
-    alfresco:
+    platform:
         image: alfresco/alfresco-content-repository-community:6.2.2-RC1
         mem_limit: 1700m
         environment:
@@ -19,12 +19,12 @@ services:
                 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 -Ddeployment.method=DOCKER_COMPOSE
+                -Dcsrf.filter.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
 
                 -Dtransform.service.enabled=false
                 -Dlocal.transform.service.enabled=false
                 
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 "
@@ -33,7 +33,7 @@ services:
             - activemq
     
     postgres-acs:
-        image: postgres:11.4
+        image: postgres:11.7
         mem_limit: 512m
         environment:
             - POSTGRES_PASSWORD=alfresco
@@ -54,16 +54,13 @@ services:
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 1g
-        ports:
-            - 8161:8161 # HTTP
-            - 5672:5672 # AMQP
-            - 61616:61616 # OpenWire
-            - 61613:61613 # STOMP
+        mem_limit: 256m
 
     proxy:
         image: alfresco/alfresco-acs-nginx:3.0.2
+        environment:
+            REPO_URL: "http://platform:8080"
         depends_on:
-            - alfresco
+            - platform
         ports:
             - 8080:8080