From 25e6137de9a9c74e132248d88c061ece3deb6506 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Wed, 25 Oct 2023 18:34:37 -0400
Subject: [PATCH 1/3] Revert "removed elasticsearch"

This reverts commit fc8a854920c3de90d93c9055393845a5ab722f46.
---
 .env               |  1 +
 docker-compose.yml | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index e02dc1e..9268010 100644
--- a/.env
+++ b/.env
@@ -7,3 +7,4 @@ PROXY_PORT=8080
 
 APS_TAG=2.4.1
 POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c35dcb..63fd7ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@
 version: "3"
 
 services:
-
     activiti-app:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
             ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
         depends_on:
             - postgres-aps
         volumes:
@@ -31,6 +31,17 @@ services:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
+    
+    search-aps:
+        image: elasticsearch:${ELASTICSEARCH_TAG}
+        environment:
+            discovery.type: single-node
+        ulimits:
+            memlock:
+                soft: -1
+                hard: -1
+        depends_on:
+            - activiti-app
 
     proxy:
         build: ./nginx-ingress

From 3fee42cd282e31efe066ad448508f44882148d28 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Wed, 25 Oct 2023 18:37:26 -0400
Subject: [PATCH 2/3] elasticsearch v.7.17.13

---
 .env               | 2 +-
 docker-compose.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 9268010..b88b4a3 100644
--- a/.env
+++ b/.env
@@ -7,4 +7,4 @@ PROXY_PORT=8080
 
 APS_TAG=2.4.1
 POSTGRES_TAG=13
-ELASTICSEARCH_TAG=7.17.7
+ELASTICSEARCH_TAG=7.17.13
diff --git a/docker-compose.yml b/docker-compose.yml
index 63fd7ef..2ebe41f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@
 version: "3"
 
 services:
+
     activiti-app:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:

From eb8df1a86ffe87446d8bd13a0a345e8273df754b Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Wed, 25 Oct 2023 18:46:40 -0400
Subject: [PATCH 3/3] fixed aps-search dependency

---
 docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2ebe41f..40e7404 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
             ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
         depends_on:
             - postgres-aps
+            - search-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
@@ -41,8 +42,6 @@ services:
             memlock:
                 soft: -1
                 hard: -1
-        depends_on:
-            - activiti-app
 
     proxy:
         build: ./nginx-ingress