Merge branch 'acs-enterprise' into acs-ats-enterprise

.env

@@ -4,3 +4,7 @@ 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

docker-compose.yml

@@ -1,14 +1,23 @@
 # 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:6.2.2.3
-        mem_limit: 1700m
+        image: quay.io/alfresco/alfresco-content-repository:${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
@@ -21,19 +30,16 @@ 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
-
-                -Dtransform.service.enabled=true
-                -Dlocal.transform.service.enabled=false
-
+                -Dcors.enabled=false
+                -Dtransform.service.enabled=false
                 -Dtransform.service.url=http://transform-router:8095
                 -Dsfs.url=http://shared-file-store:8099
+                -Dlocal.transform.service.enabled=false
                 -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
                 -Djodconverter.url=http://transform-engine-aio:8090
                 -Dimg.url=http://transform-engine-aio:8090
                 -Dtika.url=http://transform-engine-aio:8090
                 -Dtransform.misc.url=http://transform-engine-aio:8090
-                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -73,17 +79,19 @@ services:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
     postgres-acs:
-        image: postgres:11.7
-        mem_limit: 128m
+        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
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 512m
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
     proxy:
         build: ./nginx-ingress