Merge branch 'aps' into aps-search

This reverts commit fc8a854920.

.env

@@ -7,3 +7,4 @@ PROXY_PORT=8080
 
 APS_TAG=2.4.1
 POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.13

docker-compose.yml

@@ -12,9 +12,14 @@ 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
+            - search-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
     
@@ -49,6 +54,15 @@ services:
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=50 -c log_min_messages=LOG
     
+    search-aps:
+        image: elasticsearch:${ELASTICSEARCH_TAG}
+        environment:
+            discovery.type: single-node
+        ulimits:
+            memlock:
+                soft: -1
+                hard: -1
+
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:aps