fixed aps-search dependency

This reverts commit fc8a854920.

.env

@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+APS_TAG=2.4.1
+POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.13

docker-compose.yml

@@ -1,133 +1,53 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally 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: "3"
-version: "2"
 
 services:
-    platform:
+
-        image: alfresco/alfresco-content-repository:6.2.2.3
+    activiti-app:
-        mem_limit: 1700m
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
-            JAVA_OPTS: "
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-                -Ddb.driver=org.postgresql.Driver
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
-                -Dtransform.service.enabled=true
-                -Dlocal.transform.service.enabled=false
-
-                -Dtransform.service.url=http://transform-router:8095
-                -Dsfs.url=http://shared-file-store:8099
-                -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
-                "
         depends_on:
-            - postgres-acs
+            - postgres-aps
-            - activemq
+            - search-aps
-            - shared-file-store
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    transform-router:
+    activiti-admin:
-        image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
+            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            CORE_AIO_URL : "http://transform-core-aio:8090"
+            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
         depends_on:
-            - activemq
+            - postgres-aps-admin
-            - shared-file-store
+            - activiti-app
     
-    transform-core-aio:
+    postgres-aps:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+        image: postgres:${POSTGRES_TAG}
         environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
+            POSTGRES_DB: activiti
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        depends_on:
-            - activemq
-            - shared-file-store
-
-    shared-file-store:
-        image: alfresco/alfresco-shared-file-store:0.10.0
-        volumes:
-            - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    postgres-acs:
+    postgres-aps-admin:
-        image: postgres:11.7
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 512m
         environment:
-            - POSTGRES_PASSWORD=alfresco
+            POSTGRES_DB: activiti-admin
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
     
-    search:
+    search-aps:
-        image: alfresco/alfresco-search-services:2.0.1
+        image: elasticsearch:${ELASTICSEARCH_TAG}
-        mem_limit: 2g
         environment:
-            - SOLR_ALFRESCO_HOST=platform
+            discovery.type: single-node
-            - SOLR_ALFRESCO_PORT=8080
+        ulimits:
-            - SOLR_SOLR_HOST=search
+            memlock:
-            - SOLR_SOLR_PORT=8983
+                soft: -1
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+                hard: -1
-            - ALFRESCO_SECURE_COMMS=none
-
-    activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
-
-    sync:
-        image: quay.io/alfresco/service-sync:3.3.3.1
-        mem_limit: 512m
-        environment:
-            JAVA_OPTS : "
-                -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
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync
+        image: local/nginx-ingress:aps
         ports:
             - 8080:8080
         depends_on:
-            - platform
+            - activiti-app
-            - sync
+            - activiti-admin
-
-volumes:
-    shared-file-store-volume:
-        driver_opts:
-            type: tmpfs
-            device: tmpfs

nginx-ingress/entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [[ $ACS_PLATFORM_URL ]]; then
+if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SYNC_URL ]]; then
+if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -39,18 +39,21 @@ http {
         location ~ ^(/.*/s/prometheus)$ {return 403;}
         
         location / {
-            proxy_pass http://platform:8080;
+            return 301 $scheme://$http_host/activiti-app;
         }
 
-        location /alfresco/ {
+        location /activiti-app/ {
-            proxy_pass http://platform:8080;
+            proxy_pass http://activiti-app:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-        
+
-        location /sync/ {
+        location /activiti-admin/ {
-            proxy_pass http://sync:9090/alfresco/;
+            proxy_pass http://activiti-admin:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
         }
     }
 }