Merge branch 'acs-backend' into acs-backend-persist

.env

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

docker-compose.yml

@@ -1,19 +1,52 @@
-# 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:latest
+        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.secureComms=secret
+                -Dsolr.sharedSecret=alfresco-secret
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                -Ddeployment.method=DOCKER_COMPOSE
+                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
+                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
+                -Djodconverter.url=http://transform-core-aio:8090/
+                -Dimg.url=http://transform-core-aio:8090/
+                -Dtika.url=http://transform-core-aio:8090/
+                -Dtransform.misc.url=http://transform-core-aio:8090/
+                -Dcsrf.filter.enabled=false
+                -Dcors.enabled=true
+                -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
+                -Dtransform.service.enabled=false
+                -Dlocal.transform.service.enabled=true
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
                 "
         depends_on:
             - postgres-acs
@@ -21,13 +54,40 @@ services:
         volumes:
             - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
+    transform-core-aio:
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+    
     postgres-acs:
-        image: postgres:latest
+        image: postgres:${POSTGRES_TAG}
+        environment:
+            POSTGRES_PASSWORD: alfresco
+            POSTGRES_USER: alfresco
+            POSTGRES_DB: alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
         volumes:
             - acsdb-volume:/var/lib/postgresql/data:rw
+    
+    search:
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        environment:
+            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"
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
         volumes:
             - activemq-volume:/opt/activemq/data:rw
 
@@ -46,3 +106,5 @@ volumes:
         driver: local
     activemq-volume:
         driver: local
+    solrindex-volume:
+        driver: local