From 695e3b3dc09b960a33ef7286fef3625be33c63e4 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Wed, 13 Jan 2021 15:20:03 -0500
Subject: [PATCH] fixed after testing

---
 docker-compose.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index db367b4..812de01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ version: "2"
 services:
     activiti-app:
         image: alfresco/process-services:1.11.1.1
+        mem_limit: 512m
         environment:
             ACTIVITI_DATASOURCE_USERNAME: alfresco
             ACTIVITI_DATASOURCE_PASSWORD: alfresco
@@ -16,54 +17,58 @@ services:
             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"
         depends_on:
             - postgres-aps
         volumes:
-            - "$LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
     activiti-admin:
-        image: alfresco/process-services-admin:latest
+        image: alfresco/process-services-admin:1.11.1.1
+        mem_limit: 256m
         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?characterEncoding=UTF-8'
+            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"
         depends_on:
             - postgres-aps-admin
             - activiti-app
     
     postgres-aps:
         image: postgres:11.6
+        mem_limit: 256m
         environment:
-            POSTGRES_DB: postgres-aps
+            POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     postgres-aps-admin:
         image: postgres:11.6
+        mem_limit: 128m
         environment:
-            POSTGRES_DB: postgres-aps-admin
+            POSTGRES_DB: activiti-admin
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
+        command: postgres -c max_connections=50 -c log_min_messages=LOG
     
     search-aps:
         image: elasticsearch:7.6.0
-        container_name: elasticsearch
+        mem_limit: 512m
         environment:
-            - node.name=elasticsearch
-            - cluster.name=aps-es-cluster
-            - cluster.initial_master_nodes=elasticsearch
-            - bootstrap.memory_lock=true
-            - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+            discovery.type: single-node
+            ES_JAVA_OPTS: "-Xms64m -Xmx256m"
         ulimits:
             memlock:
                 soft: -1
                 hard: -1
         depends_on:
-            - activit-app
+            - activiti-app
 
     proxy:
         build: ./nginx-ingress