Merge branch 'aps-persist-base' into aps-persist

.env

@@ -5,6 +5,5 @@ PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
 
-APS_TAG=2.3.5
+APS_TAG=2.4.1
 POSTGRES_TAG=13
-ELASTICSEARCH_TAG=7.17.7

docker-compose.yml

@@ -1,8 +1,9 @@
-# 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
 #
 version: "3"
 
 services:
+
     activiti-app:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
@@ -11,10 +12,6 @@ services:
             ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
             ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
             ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_SERVER_TYPE: rest
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             JAVA_OPTS: "-Xms128m -Xmx256m"
         depends_on:
             - postgres-aps
@@ -56,20 +53,6 @@ services:
         command: postgres -c max_connections=50 -c log_min_messages=LOG
         volumes:
             - apsadmindb-volume:/var/lib/postgresql/data:rw
-    
-    search-aps:
-        image: elasticsearch:${ELASTICSEARCH_TAG}
-        environment:
-            discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
-        volumes:
-            - esindex-volume:/var/lib/postgresql/data:rw
 
     proxy:
         build: ./nginx-ingress
@@ -88,5 +71,3 @@ volumes:
         driver: local
     apsadmindb-volume:
         driver: local
-    esindex-volume:
-        driver: local