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

.env

@@ -4,3 +4,6 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+APS_TAG=2.4.1
+POSTGRES_TAG=13

docker-compose.yml

@@ -1,14 +1,13 @@
-# 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
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "3"
-version: "2"
 
 services:
+
     activiti-app:
-        image: alfresco/process-services:latest
+        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
         volumes:
@@ -16,7 +15,7 @@ services:
             - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
-        image: alfresco/process-services-admin:latest
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         environment:
             ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
             ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
@@ -25,35 +24,22 @@ services:
             - activiti-app
     
     postgres-aps:
-        image: postgres:latest
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti
         volumes:
             - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
-        image: postgres:latest
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
         volumes:
             - apsadmindb-volume:/var/lib/postgresql/data:rw
 
-    search-aps:
-        image: elasticsearch:latest
-        environment:
-            discovery.type: single-node
-        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
+        image: local/nginx-ingress:aps
         ports:
             - 8080:8080
         depends_on:
@@ -67,5 +53,3 @@ volumes:
         driver: local
     apsadmindb-volume:
         driver: local
-    esindex-volume:
-        driver: local