Merge branch 'aps-base' into aps-persist-base

This commit is contained in:
Brian Long 2022-11-01 17:06:51 -04:00
commit 3c1796b0b4
2 changed files with 10 additions and 7 deletions

4
.env
View File

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

View File

@ -1,11 +1,10 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # 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: "3"
version: "2"
services: services:
activiti-app: activiti-app:
image: alfresco/process-services:latest image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
environment: environment:
ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8' ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
@ -16,7 +15,7 @@ services:
- apsbin-volume:/var/lib/postgresql/data:rw - apsbin-volume:/var/lib/postgresql/data:rw
activiti-admin: activiti-admin:
image: alfresco/process-services-admin:latest image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
environment: environment:
ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?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_HOST: http://activiti-app
@ -25,21 +24,21 @@ services:
- activiti-app - activiti-app
postgres-aps: postgres-aps:
image: postgres:latest image: postgres:${POSTGRES_TAG}
environment: environment:
POSTGRES_DB: activiti POSTGRES_DB: activiti
volumes: volumes:
- apsdb-volume:/var/lib/postgresql/data:rw - apsdb-volume:/var/lib/postgresql/data:rw
postgres-aps-admin: postgres-aps-admin:
image: postgres:latest image: postgres:${POSTGRES_TAG}
environment: environment:
POSTGRES_DB: activiti-admin POSTGRES_DB: activiti-admin
volumes: volumes:
- apsadmindb-volume:/var/lib/postgresql/data:rw - apsadmindb-volume:/var/lib/postgresql/data:rw
search-aps: search-aps:
image: elasticsearch:latest image: elasticsearch:${ELASTICSEARCH_TAG}
environment: environment:
discovery.type: single-node discovery.type: single-node
ulimits: ulimits: