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}
@@ -21,6 +21,12 @@ services:
     
     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