Merge branch 'aps' into dbp

.env

@@ -9,11 +9,10 @@ ACS_TAG=7.4.1.1
 ATR_TAG=3.0.0
 ATE_AIO_TAG=4.0.0
 ASFS_TAG=3.0.0
-APS_TAG=2.3.5
+APS_TAG=2.4.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
 ASIE_TAG=2.0.8.2
 ACS_SHARE_TAG=7.4.1.2
 ALF_SYNC_SERV_TAG=3.9.0
 ADW_TAG=4.1.0
-ELASTICSEARCH_TAG=7.17.7

docker-compose.yml

@@ -159,10 +159,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
@@ -200,18 +196,6 @@ 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
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
-    
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-sync-share-adw-aps