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

.env

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

docker-compose.yml

@@ -8,12 +8,11 @@ services:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
             ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
         depends_on:
             - postgres-aps
-            - search-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
         image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
@@ -28,20 +27,15 @@ services:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti
+        volumes:
+            - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
-    
+        volumes:
-    search-aps:
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
-        image: elasticsearch:${ELASTICSEARCH_TAG}
-        environment:
-            discovery.type: single-node
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
 
     proxy:
         build: ./nginx-ingress
@@ -51,3 +45,11 @@ services:
         depends_on:
             - activiti-app
             - activiti-admin
+
+volumes:
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local