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

docker-compose.yml

@@ -9,7 +9,7 @@ services:
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dsolr.host=search
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -18,35 +18,16 @@ services:
         depends_on:
             - postgres-acs
             - activemq
-            - shared-file-store
-    
-    transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:latest
-        environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
-            CORE_AIO_URL : "http://transform-core-aio:8090"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        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
     
+    search:
+        image: alfresco/alfresco-search-services:latest
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_SOLR_HOST=search
+
     activemq:
         image: alfresco/alfresco-activemq:latest
 
@@ -57,9 +38,3 @@ services:
             - 8080:8080
         depends_on:
             - platform
-
-volumes:
-    shared-file-store-volume:
-        driver_opts:
-            type: tmpfs
-            device: tmpfs