Merge branch 'acs-search' into acs-search-sharded

.env

@@ -6,7 +6,6 @@ PROXY_HOST=localhost
 PROXY_PORT=8080
 
 ACS_TAG=7.4.1.1
-ATE_AIO_TAG=4.0.0
 AAMQ_TAG=latest
 POSTGRES_TAG=13
 ASIE_TAG=2.0.8.2

docker-compose.yml

@@ -27,23 +27,17 @@ services:
                 -Dsolr.host=search
                 -Dsolr.secureComms=secret
                 -Dsolr.sharedSecret=alfresco-secret
+                -Dsolr.useDynamicShardRegistration=true
                 -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
-                -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/
                 -Dcsrf.filter.enabled=false
-                -Dcors.enabled=true
-                -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
+                -Dcors.enabled=false
                 -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=true
+                -Dlocal.transform.service.enabled=false
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -52,9 +46,6 @@ services:
             - postgres-acs
             - activemq
     
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
-    
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
         environment:
@@ -68,7 +59,6 @@ services:
         environment:
             SOLR_ALFRESCO_HOST: platform
             SOLR_SOLR_HOST: search
-            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
             ALFRESCO_SECURE_COMMS: secret
             JAVA_TOOL_OPTIONS: "
                 -Dalfresco.secureComms.secret=alfresco-secret
@@ -76,6 +66,15 @@ services:
         healthcheck:
             test: "curl -fsS http://localhost:8983/solr"
     
+    search-shard-init:
+        image: cfmanteiga/alpine-bash-curl-jq
+        command: [ "bash", "-c", "
+            curl -s http://search:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=1\\&numNodes=1\\&template=rerank\\&shardIds=0,1
+            "]
+        depends_on:
+            search:
+                condition: service_healthy
+
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
         environment: