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

This commit is contained in:
Brian Long 2022-11-01 17:17:08 -04:00
commit 64708232c4
2 changed files with 10 additions and 12 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,12 +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:1.11.1.1 image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
mem_limit: 512m
environment: environment:
ACTIVITI_DATASOURCE_USERNAME: alfresco ACTIVITI_DATASOURCE_USERNAME: alfresco
ACTIVITI_DATASOURCE_PASSWORD: alfresco ACTIVITI_DATASOURCE_PASSWORD: alfresco
@ -25,8 +23,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:1.11.1.1 image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
mem_limit: 256m
environment: environment:
ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
@ -41,8 +38,7 @@ services:
- activiti-app - activiti-app
postgres-aps: postgres-aps:
image: postgres:11.6 image: postgres:${POSTGRES_TAG}
mem_limit: 128m
environment: environment:
POSTGRES_DB: activiti POSTGRES_DB: activiti
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
@ -52,8 +48,7 @@ services:
- apsdb-volume:/var/lib/postgresql/data:rw - apsdb-volume:/var/lib/postgresql/data:rw
postgres-aps-admin: postgres-aps-admin:
image: postgres:11.6 image: postgres:${POSTGRES_TAG}
mem_limit: 128m
environment: environment:
POSTGRES_DB: activiti-admin POSTGRES_DB: activiti-admin
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
@ -63,8 +58,7 @@ services:
- apsadmindb-volume:/var/lib/postgresql/data:rw - apsadmindb-volume:/var/lib/postgresql/data:rw
search-aps: search-aps:
image: elasticsearch:7.6.0 image: elasticsearch:${ELASTICSEARCH_TAG}
mem_limit: 512m
environment: environment:
discovery.type: single-node discovery.type: single-node
ES_JAVA_OPTS: "-Xms128m -Xmx256m" ES_JAVA_OPTS: "-Xms128m -Xmx256m"