Merge branch 'acs-frontend' into acs-aims

.env

@@ -7,3 +7,10 @@ PROXY_PORT=8080
 IDENTITY_SERVICE_PROTOCOL=http
 IDENTITY_SERVICE_HOST=auth.example.org
 IDENTITY_SERVICE_PORT=8080
+
+ACS_TAG=7.3.0
+ATE_AIO_TAG=3.0.0
+AAMQ_TAG=5.17.1-jre17-centos7
+POSTGRES_TAG=13
+ASIE_TAG=2.0.5
+ACS_SHARE_TAG=7.3.0

docker-compose.yml

@@ -1,22 +1,31 @@
 # 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.1"
 
 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: "
+                -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=secret
-                -Dsolr.secureComms=none
+                -Dsolr.sharedSecret=alfresco-secret
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
@@ -33,14 +42,12 @@ services:
                 -Dtika.url=http://transform-core-aio:8090/
                 -Dtransform.misc.url=http://transform-core-aio:8090/
                 -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+                -Dcors.enabled=false
-
                 -Dtransform.service.enabled=false
-
+                -Dlocal.transform.service.enabled=true
                 -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
                 -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
                 -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -54,12 +61,10 @@ services:
                 condition: service_healthy
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
-        mem_limit: 1g
     
     share:
-        image: alfresco/alfresco-share:6.2.2
+        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
-        mem_limit: 512m
         environment:
             REPO_HOST: "platform"
             CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
@@ -84,28 +89,30 @@ services:
                 "
     
     postgres-acs:
-        image: postgres:11.7
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 128m
         environment:
-            - POSTGRES_PASSWORD=alfresco
+            POSTGRES_PASSWORD: alfresco
-            - POSTGRES_USER=alfresco
+            POSTGRES_USER: alfresco
-            - POSTGRES_DB=alfresco
+            POSTGRES_DB: alfresco
         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
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
     identity:
         image: alfresco/alfresco-identity-service:1.4.0