Merge branch 'aps-base' into aps

This commit is contained in:
Brian Long 2023-10-25 18:39:33 -04:00
commit 8901d10f82
2 changed files with 3 additions and 19 deletions

3
.env
View File

@ -5,6 +5,5 @@ PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
APS_TAG=2.3.5 APS_TAG=2.4.1
POSTGRES_TAG=13 POSTGRES_TAG=13
ELASTICSEARCH_TAG=7.17.7

View File

@ -1,8 +1,9 @@
# 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" version: "3"
services: services:
activiti-app: activiti-app:
image: quay.io/alfresco/alfresco-process-services:${APS_TAG} image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
environment: environment:
@ -11,10 +12,6 @@ services:
ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
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_SERVER_TYPE: rest
ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
ACTIVITI_ES_REST_CLIENT_PORT: 9200
ACTIVITI_ES_REST_CLIENT_SCHEMA: http
JAVA_OPTS: "-Xms128m -Xmx256m" JAVA_OPTS: "-Xms128m -Xmx256m"
depends_on: depends_on:
- postgres-aps - postgres-aps
@ -51,18 +48,6 @@ services:
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
POSTGRES_PASSWORD: alfresco POSTGRES_PASSWORD: alfresco
command: postgres -c max_connections=50 -c log_min_messages=LOG command: postgres -c max_connections=50 -c log_min_messages=LOG
search-aps:
image: elasticsearch:${ELASTICSEARCH_TAG}
environment:
discovery.type: single-node
ES_JAVA_OPTS: "-Xms128m -Xmx256m"
ulimits:
memlock:
soft: -1
hard: -1
depends_on:
- activiti-app
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress