Merge branch 'aps' into aps-aims

.env

@@ -7,3 +7,7 @@ PROXY_PORT=8080
 IDENTITY_SERVICE_PROTOCOL=http
 IDENTITY_SERVICE_HOST=auth.example.org
 IDENTITY_SERVICE_PORT=8080
+
+APS_TAG=2.3.5
+POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.7

docker-compose.yml

@@ -1,12 +1,10 @@
 # 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.1"
 
 services:
     activiti-app:
-        image: alfresco/process-services:1.11.1.1
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
-        mem_limit: 512m
         environment:
             ACTIVITI_DATASOURCE_USERNAME: alfresco
             ACTIVITI_DATASOURCE_PASSWORD: alfresco
@@ -20,15 +18,14 @@ services:
             IDENTITY_SERVICE_ENABLED: "true"
             IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
             IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+            JAVA_OPTS: "-Xms128m -Xmx256m"
         depends_on:
             - postgres-aps
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
     
     activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
-        mem_limit: 256m
         environment:
             ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
             ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
@@ -37,14 +34,13 @@ services:
             ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
             ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
             ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+            JAVA_OPTS: "-Xms64m -Xmx128m"
         depends_on:
             - postgres-aps-admin
             - activiti-app
     
     postgres-aps:
-        image: postgres:11.6
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
@@ -52,8 +48,7 @@ services:
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     postgres-aps-admin:
-        image: postgres:11.6
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti-admin
             POSTGRES_USER: alfresco
@@ -61,8 +56,7 @@ services:
         command: postgres -c max_connections=50 -c log_min_messages=LOG
     
     search-aps:
-        image: elasticsearch:7.6.0
+        image: elasticsearch:${ELASTICSEARCH_TAG}
-        mem_limit: 512m
         environment:
             discovery.type: single-node
             ES_JAVA_OPTS: "-Xms128m -Xmx256m"