From 2b7755222b768c55239dcfd672e2bb573be4df94 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Wed, 13 Jan 2021 14:42:41 -0500
Subject: [PATCH] added versions and config to APS

---
 docker-compose.yml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f09d282..db367b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,10 +5,17 @@ version: "2"
 
 services:
     activiti-app:
-        image: alfresco/process-services:latest
+        image: alfresco/process-services:1.11.1.1
         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
         depends_on:
             - postgres-aps
         volumes:
@@ -17,22 +24,33 @@ services:
     activiti-admin:
         image: alfresco/process-services-admin:latest
         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_REST_APP_HOST: http://activiti-app
+            ACTIVITI_ADMIN_REST_APP_PORT: 8080
         depends_on:
             - postgres-aps-admin
             - activiti-app
-        volumes:
-            - ./activiti-admin.properties:/usr/local/tomcat/lib/activiti-admin.properties
     
     postgres-aps:
-        image: postgres:latest
+        image: postgres:11.6
+        environment:
+            POSTGRES_DB: postgres-aps
+            POSTGRES_USER: alfresco
+            POSTGRES_PASSWORD: alfresco
     
     postgres-aps-admin:
-        image: postgres:latest
+        image: postgres:11.6
+        environment:
+            POSTGRES_DB: postgres-aps-admin
+            POSTGRES_USER: alfresco
+            POSTGRES_PASSWORD: alfresco
     
     search-aps:
-        image: elasticsearch:latest
+        image: elasticsearch:7.6.0
         container_name: elasticsearch
         environment:
             - node.name=elasticsearch