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

docker-compose.yml

@@ -27,7 +27,6 @@ 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}
@@ -45,6 +44,8 @@ services:
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
@@ -53,27 +54,23 @@ services:
             POSTGRES_USER: alfresco
             POSTGRES_DB: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
         image: alfresco/alfresco-search-services:${ASIE_TAG}
         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
                 "
         healthcheck:
             test: "curl -fsS http://localhost:8983/solr"
-    
+        volumes:
-    search-shard-init:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
-        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}
@@ -81,6 +78,8 @@ services:
             ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
             ACTIVEMQ_ADMIN_LOGIN: alfresco
             ACTIVEMQ_ADMIN_PASSWORD: alfresco
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -89,3 +88,13 @@ services:
             - 8080:8080
         depends_on:
             - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local