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

docker-compose.yml

@@ -1,11 +1,11 @@
 # 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.1"
+version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository:6.2.2.3
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -14,10 +14,9 @@ services:
                 -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
-                -Dsolr.host=search1
+                -Dsolr.host=search
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
-                -Dsolr.useDynamicShardRegistration=true
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
@@ -62,7 +61,6 @@ services:
     
     transform-router:
         image: quay.io/alfresco/alfresco-transform-router:1.3.1
-        mem_limit: 128m
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -73,7 +71,6 @@ services:
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
-        mem_limit: 1g
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -83,12 +80,11 @@ services:
 
     shared-file-store:
         image: alfresco/alfresco-shared-file-store:0.10.0
-        mem_limit: 256m
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
     share:
-        image: alfresco/alfresco-share:6.2.2
+        image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
         mem_limit: 512m
         environment:
             REPO_HOST: "platform"
@@ -105,53 +101,27 @@ services:
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 128m
+        mem_limit: 512m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
-    search1:
+    search:
-        image: docker.inteligr8.com/inteligr8/alfresco-search-services:2.0.1
+        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 1g
+        mem_limit: 2g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search1
+            - SOLR_SOLR_HOST=search
             - SOLR_SOLR_PORT=8983
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
-        healthcheck:
-            test: "curl -fsS http://localhost:8983/solr"
-    
-    search2:
-        image: docker.inteligr8.com/inteligr8/alfresco-search-services:2.0.1
-        mem_limit: 1g
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search2
-            - SOLR_SOLR_PORT=8983
-            - ALFRESCO_SECURE_COMMS=none
-        healthcheck:
-            test: "curl -fsS http://localhost:8983/solr"
-    
-    search-shard-init:
-        image: cfmanteiga/alpine-bash-curl-jq
-        mem_limit: 64m
-        command: [ "bash", "-c", "
-            curl -s http://search1:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=1\\&numNodes=2\\&template=rerank\\&shardIds=0 &&
-            curl -s http://search2:8983/solr/admin/cores?action=newCore\\&core=alfresco\\&storeRef=workspace://SpacesStore\\&numShards=2\\&nodeInstance=2\\&numNodes=2\\&template=rerank\\&shardIds=1
-            "]
-        depends_on:
-            search1:
-                condition: service_healthy
-            search2:
-                condition: service_healthy
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 512m
+        mem_limit: 256m
 
     sync:
         image: quay.io/alfresco/service-sync:3.3.3.1
@@ -183,7 +153,6 @@ services:
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-sync-share-adw
-        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: