Merge branch 'acs-base' into acs-lats-base

docker-compose.yml

@@ -9,25 +9,28 @@ services:
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Dsolr.host=search
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                -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/
                 "
         depends_on:
             - postgres-acs
             - activemq
     
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:latest
+    
     postgres-acs:
         image: postgres:latest
 
-    search:
-        image: alfresco/alfresco-search-services:latest
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_SOLR_HOST=search
-
     activemq:
         image: alfresco/alfresco-activemq:latest