Merge branch 'acs-frontend' into ags-frontend

.env

@@ -4,10 +4,3 @@ 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,32 +1,22 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
     platform:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: alfresco/alfresco-governance-repository-community:V3.4-latest
+        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.secureComms=secret
-                -Dsolr.sharedSecret=alfresco-secret
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
@@ -43,9 +33,10 @@ services:
                 -Dtika.url=http://transform-core-aio:8090/
                 -Dtransform.misc.url=http://transform-core-aio:8090/
                 -Dcsrf.filter.enabled=false
-                -Dcors.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
                 -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=true
+                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -53,14 +44,13 @@ services:
         depends_on:
             - postgres-acs
             - activemq
-        volumes:
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+        image: alfresco/alfresco-transform-core-aio:2.3.6
     
     share:
-        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
+        image: alfresco/alfresco-governance-share-community:V3.4-latest
+        mem_limit: 512m
         environment:
             REPO_HOST: "platform"
             CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
@@ -75,38 +65,28 @@ services:
                 "
     
     postgres-acs:
-        image: postgres:${POSTGRES_TAG}
+        image: postgres:11.7
+        mem_limit: 512m
         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
-        volumes:
-            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        image: alfresco/alfresco-search-services:2.0.1
+        mem_limit: 2g
         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
+            - 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
 
     activemq:
-        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
+        image: alfresco/alfresco-activemq:5.15.8
+        mem_limit: 256m
 
     proxy:
         build: ./nginx-ingress
@@ -116,13 +96,3 @@ services:
         depends_on:
             - platform
             - share
-
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local