Merge branch 'aps' into aps-search

This reverts commit fc8a854920.

.env

@@ -7,3 +7,4 @@ PROXY_PORT=8080
 
 APS_TAG=2.4.1
 POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.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

@@ -7,18 +7,33 @@ services:
     activiti-app:
         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: "-Xms128m -Xmx256m"
         depends_on:
             - postgres-aps
+            - search-aps
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
-            - apsbin-volume:/var/lib/postgresql/data:rw
+            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
     
     activiti-admin:
         image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         environment:
+            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
             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: "-Xms64m -Xmx128m"
         depends_on:
             - postgres-aps-admin
             - activiti-app
@@ -27,15 +42,26 @@ services:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti
-        volumes:
-            - apsdb-volume:/var/lib/postgresql/data:rw
+            POSTGRES_USER: alfresco
+            POSTGRES_PASSWORD: alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     postgres-aps-admin:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
-        volumes:
-            - apsadmindb-volume:/var/lib/postgresql/data:rw
+            POSTGRES_USER: alfresco
+            POSTGRES_PASSWORD: alfresco
+        command: postgres -c max_connections=50 -c log_min_messages=LOG
+    
+    search-aps:
+        image: elasticsearch:${ELASTICSEARCH_TAG}
+        environment:
+            discovery.type: single-node
+        ulimits:
+            memlock:
+                soft: -1
+                hard: -1
 
     proxy:
         build: ./nginx-ingress
@@ -45,11 +71,3 @@ services:
         depends_on:
             - activiti-app
             - activiti-admin
-
-volumes:
-    apsbin-volume:
-        driver: local
-    apsdb-volume:
-        driver: local
-    apsadmindb-volume:
-        driver: local