Merge branch 'ags-backend' into ags-frontend

.env

@@ -9,3 +9,5 @@ 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

@@ -5,7 +5,7 @@ version: "3"
 services:
 
     platform:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: alfresco/alfresco-governance-repository-community:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -23,7 +23,13 @@ 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
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -37,8 +43,7 @@ services:
                 -Dtika.url=http://transform-core-aio:8090/
                 -Dtransform.misc.url=http://transform-core-aio:8090/
                 -Dcsrf.filter.enabled=false
-                -Dcors.enabled=true
+                -Dcors.enabled=false
-                -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
@@ -52,6 +57,21 @@ services:
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
     
+    share:
+        image: alfresco/alfresco-governance-share-community:${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:${POSTGRES_TAG}
         environment:
@@ -60,6 +80,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:
@@ -69,8 +102,9 @@ services:
 
     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;
+        }
     }
 }