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

docker-compose.yml

@@ -5,47 +5,31 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        image: alfresco/alfresco-content-repository:latest
-        mem_limit: 1700m
         environment:
             JAVA_OPTS: "
-                -Ddb.driver=com.mysql.jdbc.Driver
+                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
+                -Dsolr.host=search
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
-                -Dindex.subsystem.name=noindex
                 -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
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
-                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=false
-                
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
                 "
         depends_on:
-            - mysql-acs
+            - postgres-acs
             - activemq
     
-    mysql-acs:
+    postgres-acs:
-        image: mysql:5.7
+        image: postgres:latest
-        mem_limit: 512m
+    
+    search:
+        image: alfresco/alfresco-search-services:latest
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            - SOLR_ALFRESCO_HOST=platform
-            - MYSQL_PASSWORD=alfresco
+            - SOLR_SOLR_HOST=search
-            - MYSQL_USER=alfresco
-            - MYSQL_DATABASE=alfresco
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
+        image: alfresco/alfresco-activemq:latest
-        mem_limit: 256m
 
     proxy:
         build: ./nginx-ingress