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

.env

@@ -4,3 +4,8 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.3.0
+AAMQ_TAG=5.17.1-jre17-centos7
+POSTGRES_TAG=13
+ASIE_TAG=2.0.5

docker-compose.yml

@@ -1,13 +1,20 @@
 # 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: "3"
-version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
-        mem_limit: 1700m
         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: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
@@ -15,8 +22,8 @@ services:
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
-                -Dsolr.port=8983
+                -Dsolr.secureComms=secret
-                -Dsolr.secureComms=none
+                -Dsolr.sharedSecret=alfresco-secret
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -38,8 +45,7 @@ services:
             - activemq
     
     postgres-acs:
-        image: postgres:11.7
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -47,19 +53,18 @@ services:
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     search:
-        image: alfresco/alfresco-search-services:2.0.1
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
-        mem_limit: 1g
         environment:
-            - SOLR_ALFRESCO_HOST=platform
+            SOLR_ALFRESCO_HOST: platform
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_SOLR_HOST: search
-            - SOLR_SOLR_HOST=search
+            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-            - SOLR_SOLR_PORT=8983
+            ALFRESCO_SECURE_COMMS: secret
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            JAVA_TOOL_OPTIONS: "
-            - ALFRESCO_SECURE_COMMS=none
+                -Dalfresco.secureComms.secret=alfresco-secret
+                "
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        mem_limit: 512m
 
     proxy:
         build: ./nginx-ingress