Compare commits

...

12 Commits

Author SHA1 Message Date
eb8df1a86f fixed aps-search dependency 2023-10-25 18:46:40 -04:00
3fee42cd28 elasticsearch v.7.17.13 2023-10-25 18:37:26 -04:00
25e6137de9 Revert "removed elasticsearch"
This reverts commit fc8a854920.
2023-10-25 18:34:37 -04:00
e0e190d987 APS v2.4.1 2023-10-25 18:33:38 -04:00
fc8a854920 removed elasticsearch 2023-10-25 18:32:39 -04:00
7e526e0e1e Merge branch 'proxy' into aps-base 2023-10-25 18:29:28 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -04:00
dd967a17f2 parameterized APS versions 2022-11-01 17:06:07 -04:00
27a818fd22 Merge branch 'proxy' into aps-base 2022-11-01 17:00:56 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
10e7f81163 advancing to docker v3 2022-11-01 14:46:58 -04:00
2 changed files with 13 additions and 10 deletions

4
.env
View File

@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
PROXY_PORT=8080
APS_TAG=2.4.1
POSTGRES_TAG=13
ELASTICSEARCH_TAG=7.17.13

View File

@@ -1,21 +1,22 @@
# 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
#
# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
version: "2"
version: "3"
services:
activiti-app:
image: alfresco/process-services:latest
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
- search-aps
volumes:
- "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
activiti-admin:
image: alfresco/process-services-admin:latest
image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
environment:
ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
@@ -24,25 +25,23 @@ services:
- activiti-app
postgres-aps:
image: postgres:latest
image: postgres:${POSTGRES_TAG}
environment:
POSTGRES_DB: activiti
postgres-aps-admin:
image: postgres:latest
image: postgres:${POSTGRES_TAG}
environment:
POSTGRES_DB: activiti-admin
search-aps:
image: elasticsearch:latest
image: elasticsearch:${ELASTICSEARCH_TAG}
environment:
discovery.type: single-node
ulimits:
memlock:
soft: -1
hard: -1
depends_on:
- activiti-app
proxy:
build: ./nginx-ingress