Merge branch 'ags-enterprise' into ags-backend-enterprise

.env

@@ -4,3 +4,12 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+ATR_TAG=3.0.0
+ATE_AIO_TAG=4.0.0
+ASFS_TAG=3.0.0
+AAMQ_TAG=latest
+POSTGRES_TAG=13
+ASIE_TAG=2.0.8.2
+ALF_SYNC_SERV_TAG=3.9.0

README.md

@@ -3,3 +3,11 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### ACS Enterprise
+
+The enterprise version of ACS requires a license file for it to work for more than 2 days.  This means it isn't really required, but it is becomes important when you utilize any `persist` branch.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`.  There must be just one file in there that ends in `.lic`.
+

docker-compose.yml

@@ -1,22 +1,32 @@
-# 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:6.2.2.3
-        mem_limit: 1700m
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:${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
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -24,21 +34,17 @@ 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=true
-                -Dlocal.transform.service.enabled=false
-
                 -Dtransform.service.url=http://transform-router:8095
                 -Dsfs.url=http://shared-file-store:8099
+                -Dlocal.transform.service.enabled=true
                 -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
-
                 -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
-                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -51,7 +57,7 @@ services:
             - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
     
     transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -61,7 +67,7 @@ services:
             - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -70,39 +76,43 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:0.10.0
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
     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
+            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"
 
     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
 
     sync:
-        image: quay.io/alfresco/service-sync:3.3.3.1
-        mem_limit: 512m
+        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
         environment:
             JAVA_OPTS : "
+                -Xms64m -Xmx256m
                 -Dsql.db.driver=org.postgresql.Driver
                 -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dsql.db.username=alfresco
@@ -111,7 +121,6 @@ services:
                 -Drepo.hostname=platform
                 -Drepo.port=8080
                 -Ddw.server.applicationConnectors[0].type=http
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
                 "
         depends_on:
             - postgres-acs