Merge branch 'acs-search-persist' into acs-backend-persist

docker-compose.yml

@@ -5,31 +5,77 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository:latest
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        mem_limit: 1700m
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
+                -Ddb.username=alfresco
+                -Ddb.password=alfresco
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                -Ddeployment.method=DOCKER_COMPOSE
+                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
+                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
+                -Djodconverter.url=http://transform-core-aio:8090/
+                -Dimg.url=http://transform-core-aio:8090/
+                -Dtika.url=http://transform-core-aio:8090/
+                -Dtransform.misc.url=http://transform-core-aio:8090/
+                -Dcsrf.filter.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
+                -Dtransform.service.enabled=false
+                
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
                 "
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
+    
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:2.3.6
     
     postgres-acs:
-        image: postgres:latest
+        image: postgres:11.7
+        mem_limit: 512m
+        environment:
+            - POSTGRES_PASSWORD=alfresco
+            - POSTGRES_USER=alfresco
+            - POSTGRES_DB=alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
-        image: alfresco/alfresco-search-services:latest
+        image: alfresco/alfresco-search-services:2.0.1
+        mem_limit: 2g
         environment:
             - SOLR_ALFRESCO_HOST=platform
+            - SOLR_ALFRESCO_PORT=8080
             - SOLR_SOLR_HOST=search
+            - SOLR_SOLR_PORT=8983
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            - ALFRESCO_SECURE_COMMS=none
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:5.15.8
+        mem_limit: 256m
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -38,3 +84,13 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local