From c2a9679ede3cda961f4ab5517f4d2526b24ee391 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:05:39 -0400 Subject: [PATCH 1/4] update comment --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2668565..813001f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,3 @@ -# 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 # version: "3" From fc8a854920c3de90d93c9055393845a5ab722f46 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:32:39 -0400 Subject: [PATCH 2/4] removed elasticsearch --- .env | 1 - docker-compose.yml | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.env b/.env index 47d1267..7174066 100644 --- a/.env +++ b/.env @@ -7,4 +7,3 @@ PROXY_PORT=8080 APS_TAG=2.3.5 POSTGRES_TAG=13 -ELASTICSEARCH_TAG=7.17.7 diff --git a/docker-compose.yml b/docker-compose.yml index 63fd7ef..6c35dcb 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,17 +31,6 @@ 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 e0e190d987e8efdac8fdbb0bdb8395eec167bde2 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:33:38 -0400 Subject: [PATCH 3/4] APS v2.4.1 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 7174066..e02dc1e 100644 --- a/.env +++ b/.env @@ -5,5 +5,5 @@ PROXY_PROTOCOL=http PROXY_HOST=localhost PROXY_PORT=8080 -APS_TAG=2.3.5 +APS_TAG=2.4.1 POSTGRES_TAG=13 From 944397b02c4b427a0531660954a8021c785e0c96 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:48:58 -0400 Subject: [PATCH 4/4] removed aps-search --- docker-compose.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea789e5..f65b6d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: 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: @@ -36,19 +35,6 @@ services: POSTGRES_DB: activiti-admin volumes: - apsadmindb-volume:/var/lib/postgresql/data:rw - - search-aps: - image: elasticsearch:${ELASTICSEARCH_TAG} - environment: - discovery.type: single-node - ulimits: - memlock: - soft: -1 - hard: -1 - depends_on: - - activiti-app - volumes: - - esindex-volume:/var/lib/postgresql/data:rw proxy: build: ./nginx-ingress @@ -66,5 +52,3 @@ volumes: driver: local apsadmindb-volume: driver: local - esindex-volume: - driver: local