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

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}
@@ -25,6 +25,14 @@ services:
         image: postgres:latest
         volumes:
             - acsdb-volume:/var/lib/postgresql/data:rw
+    
+    search:
+        image: alfresco/alfresco-search-services:latest
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_SOLR_HOST=search
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:latest
@@ -46,3 +54,5 @@ volumes:
         driver: local
     activemq-volume:
         driver: local
+    solrindex-volume:
+        driver: local