Merge branch 'dbp' into dbp-persist

.env

@@ -5,15 +5,14 @@ PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
 
-ACS_TAG=7.3.0
-ATR_TAG=2.0.0
-ATE_AIO_TAG=3.0.0
-ASFS_TAG=2.0.0
-APS_TAG=2.3.5
-AAMQ_TAG=5.17.1-jre17-centos7
+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.4.1
+AAMQ_TAG=latest
 POSTGRES_TAG=13
-ASIE_TAG=2.0.5
-ACS_SHARE_TAG=7.3.0
-ALF_SYNC_SERV_TAG=3.7
-ADW_TAG=3.1.0
-ELASTICSEARCH_TAG=7.17.7
+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

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:
+
     platform:
         image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
         environment:
@@ -118,6 +119,8 @@ services:
             JAVA_TOOL_OPTIONS: "
                 -Dalfresco.secureComms.secret=alfresco-secret
                 "
+        healthcheck:
+            test: "curl -fsS http://localhost:8983/solr"
         volumes:
             - solrindex-volume:/opt/alfresco-search-services/data:rw
 
@@ -163,10 +166,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
@@ -209,20 +208,6 @@ services:
         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
         image: local/nginx-ingress:acs-sync-share-adw-aps