Merge branch 'aps' into aps-persist

.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

README.md

@@ -3,3 +3,10 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### APS
+
+APS requires a license file for it to work.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/aps`.  The filename must be `activiti.lic`.  You can use symbolic linking if desired.

docker-compose.yml

@@ -1,32 +1,26 @@
-# 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: "2"
+version: "3"
 
 services:
+
     activiti-app:
-        image: alfresco/process-services:1.11.1.1
-        mem_limit: 512m
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
             ACTIVITI_DATASOURCE_USERNAME: alfresco
             ACTIVITI_DATASOURCE_PASSWORD: alfresco
             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: "-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"
             - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
-        image: alfresco/process-services-admin:1.11.1.1
-        mem_limit: 256m
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         environment:
             ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
             ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
@@ -35,14 +29,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
-        mem_limit: 256m
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
@@ -52,8 +45,7 @@ services:
             - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
+        image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
             POSTGRES_USER: alfresco
@@ -62,24 +54,9 @@ services:
         volumes:
             - apsadmindb-volume:/var/lib/postgresql/data:rw
 
-    search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
-        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
+        image: local/nginx-ingress:aps
         ports:
             - 8080:8080
         depends_on:
@@ -93,5 +70,3 @@ volumes:
         driver: local
     apsadmindb-volume:
         driver: local
-    esindex-volume:
-        driver: local