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

.env

@@ -11,3 +11,5 @@ ATE_AIO_TAG=4.0.0
 ASFS_TAG=3.0.0
 AAMQ_TAG=latest
 POSTGRES_TAG=13
+ASIE_TAG=2.0.8.2
+ALF_SYNC_SERV_TAG=3.9.0

docker-compose.yml

@@ -5,7 +5,7 @@ version: "3"
 services:
 
     platform:
-        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -23,7 +23,10 @@ services:
                 -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
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -32,15 +35,16 @@ services:
                 -Ddeployment.method=DOCKER_COMPOSE
                 -Dcsrf.filter.enabled=false
                 -Dcors.enabled=false
-                -Dtransform.service.enabled=false
+                -Dtransform.service.enabled=true
                 -Dtransform.service.url=http://transform-router:8095
                 -Dsfs.url=http://shared-file-store:8099
-                -Dlocal.transform.service.enabled=false
+                -Dlocal.transform.service.enabled=true
                 -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
                 -Djodconverter.url=http://transform-engine-aio:8090
                 -Dimg.url=http://transform-engine-aio:8090
                 -Dtika.url=http://transform-engine-aio:8090
                 -Dtransform.misc.url=http://transform-engine-aio:8090
+                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
@@ -84,6 +88,19 @@ services:
             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:${AAMQ_TAG}
         environment:
@@ -91,13 +108,32 @@ services:
             ACTIVEMQ_ADMIN_LOGIN: alfresco
             ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
+    sync:
+        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
+                -Dsql.db.password=alfresco
+                -Dmessaging.broker.host=activemq
+                -Drepo.hostname=platform
+                -Drepo.port=8080
+                -Ddw.server.applicationConnectors[0].type=http
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-sync
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - sync
 
 volumes:
     shared-file-store-volume:

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_SYNC_URL ]]; then
+  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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,9 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+        
+        location /sync/ {
+            proxy_pass http://sync:9090/alfresco/;
+        }
     }
 }