ACS search 2.0.8.2

.env

@@ -8,4 +8,4 @@ PROXY_PORT=8080
 ACS_TAG=7.4.1.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
-ACS_SHARE_TAG=7.4.1.2
+ASIE_TAG=2.0.8.2

docker-compose.yml

@@ -18,10 +18,9 @@ services:
                 -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
+                -Dsolr.host=search
+                -Dsolr.secureComms=secret
+                -Dsolr.sharedSecret=alfresco-secret
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -31,32 +30,26 @@ services:
             - postgres-acs
             - activemq
     
-    share:
-        image: alfresco/alfresco-share:${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}
     
+    search:
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        environment:
+            SOLR_ALFRESCO_HOST: platform
+            SOLR_SOLR_HOST: search
+            ALFRESCO_SECURE_COMMS: secret
+            JAVA_TOOL_OPTIONS: "
+                -Dalfresco.secureComms.secret=alfresco-secret
+                "
+
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - share

nginx-ingress/entrypoint.sh

@@ -4,10 +4,6 @@ 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,12 +48,5 @@ 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;
-        }
     }
 }