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

.env

@@ -6,5 +6,10 @@ PROXY_HOST=localhost
 PROXY_PORT=8080
 
 ACS_TAG=7.3.0
+ATR_TAG=2.0.0
+ATE_AIO_TAG=3.0.0
+ASFS_TAG=2.0.0
 AAMQ_TAG=5.17.1-jre17-centos7
 POSTGRES_TAG=13
+ASIE_TAG=2.0.5
+ALF_SYNC_SERV_TAG=3.7

docker-compose.yml

@@ -24,8 +24,8 @@ services:
                 -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}
@@ -56,8 +56,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
-        mem_limit: 128m
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -67,8 +66,7 @@ services:
             - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-        mem_limit: 1g
+        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"
@@ -77,8 +75,7 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:0.10.0
-        mem_limit: 256m
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
@@ -91,15 +88,15 @@ services:
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     search:
-        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 1g
+        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
+                "
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
@@ -109,10 +106,10 @@ services:
             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
@@ -121,7 +118,6 @@ services:
                 -Drepo.hostname=platform
                 -Drepo.port=8080
                 -Ddw.server.applicationConnectors[0].type=http
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
                 "
         depends_on:
             - postgres-acs