Merge branch 'acs-search-base' into acs-search-persist

.env

@@ -4,8 +4,3 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-
-ACS_TAG=7.4.1.1
-AAMQ_TAG=latest
-POSTGRES_TAG=13
-ALF_SYNC_SERV_TAG=3.9.0

docker-compose.yml

@@ -1,57 +1,58 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
     platform:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: alfresco/alfresco-content-repository:latest
         environment:
-            JAVA_TOOL_OPTIONS: "
-                -Dencryption.keystore.type=JCEKS
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-                -Dencryption.keyAlgorithm=DESede
-                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-                -Dmetadata-keystore.password=mp6yc0UD9e
-                -Dmetadata-keystore.aliases=metadata
-                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-                -Dmetadata-keystore.metadata.algorithm=DESede"
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dsolr.host=search
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                 "
         depends_on:
             - postgres-acs
             - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
-        image: postgres:${POSTGRES_TAG}
+        image: postgres:latest
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
+    
+    search:
+        image: alfresco/alfresco-search-services:latest
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_SOLR_HOST=search
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
-        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-
-    sync:
-        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
-        environment:
-            JAVA_OPTS : "
-                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dmessaging.broker.host=activemq
-                -Drepo.hostname=platform
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
+        image: alfresco/alfresco-activemq:latest
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - sync
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local

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_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,9 +48,5 @@ 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/;
-        }
     }
 }