Merge branch 'ats-base' into acs-ats-base

docker-compose.yml

@@ -5,47 +5,50 @@ 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
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -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
+            - shared-file-store
     
-    mysql-acs:
+    transform-router:
-        image: mysql:5.7
+        image: quay.io/alfresco/alfresco-transform-router:latest
-        mem_limit: 512m
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            ACTIVEMQ_URL: "nio://activemq:61616"
-            - MYSQL_PASSWORD=alfresco
+            CORE_AIO_URL : "http://transform-core-aio:8090"
-            - MYSQL_USER=alfresco
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-            - MYSQL_DATABASE=alfresco
+        depends_on:
+            - activemq
+            - shared-file-store
+    
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:latest
+        environment:
+            ACTIVEMQ_URL: "nio://activemq:61616"
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+        depends_on:
+            - activemq
+            - shared-file-store
+
+    shared-file-store:
+        image: alfresco/alfresco-shared-file-store:latest
+        volumes:
+            - shared-file-store-volume:/tmp/Alfresco/sfs
+    
+    postgres-acs:
+        image: postgres:latest
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
+        image: alfresco/alfresco-activemq:latest
-        mem_limit: 256m
 
     proxy:
         build: ./nginx-ingress
@@ -54,3 +57,9 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    shared-file-store-volume:
+        driver_opts:
+            type: tmpfs
+            device: tmpfs