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

.env

@@ -1,7 +1,11 @@
-EXTERNAL_RESOURCE_DIR=~
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
-ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+AAMQ_TAG=latest
+POSTGRES_TAG=13
+ASIE_TAG=2.0.8.2

docker-compose.yml

@@ -1,22 +1,33 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2"
+version: "3"
 
 services:
+
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
-        mem_limit: 1700m
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
+            JAVA_TOOL_OPTIONS: "
+                -Dencryption.keystore.type=JCEKS
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+                -Dencryption.keyAlgorithm=DESede
+                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
+                -Dmetadata-keystore.password=mp6yc0UD9e
+                -Dmetadata-keystore.aliases=metadata
+                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
+                -Dmetadata-keystore.metadata.algorithm=DESede
+                "
             JAVA_OPTS: "
+                -Xms512m -Xmx1g
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
+                -Dsolr.secureComms=secret
+                -Dsolr.sharedSecret=alfresco-secret
+                -Dsolr.useDynamicShardRegistration=true
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -24,11 +35,9 @@ services:
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 -Ddeployment.method=DOCKER_COMPOSE
                 -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
+                -Dcors.enabled=false
                 -Dtransform.service.enabled=false
                 -Dlocal.transform.service.enabled=false
-                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -38,28 +47,40 @@ services:
             - activemq
     
     postgres-acs:
-        image: postgres:11.7
-        mem_limit: 512m
+        image: postgres:${POSTGRES_TAG}
         environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
+            POSTGRES_PASSWORD: alfresco
+            POSTGRES_USER: alfresco
+            POSTGRES_DB: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     search:
-        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
         environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            - ALFRESCO_SECURE_COMMS=none
+            SOLR_ALFRESCO_HOST: platform
+            SOLR_SOLR_HOST: search
+            ALFRESCO_SECURE_COMMS: secret
+            JAVA_TOOL_OPTIONS: "
+                -Dalfresco.secureComms.secret=alfresco-secret
+                "
+        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:5.15.8
-        mem_limit: 256m
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
     proxy:
         build: ./nginx-ingress