Merge branch 'acs-backend' into acs-frontend

.env

@@ -4,3 +4,10 @@ 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
+ACS_SHARE_TAG=7.4.1.2

docker-compose.yml

@@ -1,19 +1,35 @@
-# 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-community:6.2.0-ga
-        mem_limit: 1700m
+        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=noindex
+                -Dindex.subsystem.name=solr6
+                -Dsolr.host=search
+                -Dsolr.secureComms=secret
+                -Dsolr.sharedSecret=alfresco-secret
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -27,10 +43,10 @@ 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=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
@@ -40,25 +56,56 @@ services:
             - activemq
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+    
+    share:
+        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
+        environment:
+            REPO_HOST: "platform"
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
+            JAVA_OPTS: "
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                "
     
     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:${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"
 
     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
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - share

nginx-ingress/entrypoint.sh

@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $ACS_SHARE_URL ]]; then
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -48,5 +48,12 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+
+        location /share/ {
+            proxy_pass http://share:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }