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

.env

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

docker-compose.yml

@@ -1,22 +1,22 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
     activiti-app:
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+        image: alfresco/process-services:latest
         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}
+        image: alfresco/process-services-admin:latest
         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,29 +25,47 @@ services:
             - activiti-app
     
     postgres-aps:
-        image: postgres:${POSTGRES_TAG}
+        image: postgres:latest
         environment:
             POSTGRES_DB: activiti
+        volumes:
+            - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
-        image: postgres:${POSTGRES_TAG}
+        image: postgres:latest
         environment:
             POSTGRES_DB: activiti-admin
+        volumes:
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
     
     search-aps:
-        image: elasticsearch:${ELASTICSEARCH_TAG}
+        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:aps
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - activiti-app
             - activiti-admin
+
+volumes:
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local
+    esindex-volume:
+        driver: local