Merge branch 'aps' into aps-persist

This commit is contained in:
Brian Long 2022-11-01 17:17:46 -04:00
commit 17738d0a96

View File

@ -15,11 +15,11 @@ services:
ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
ACTIVITI_ES_REST_CLIENT_PORT: 9200 ACTIVITI_ES_REST_CLIENT_PORT: 9200
ACTIVITI_ES_REST_CLIENT_SCHEMA: http ACTIVITI_ES_REST_CLIENT_SCHEMA: http
JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" JAVA_OPTS: "-Xms128m -Xmx256m"
depends_on: depends_on:
- postgres-aps - postgres-aps
volumes: volumes:
- "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro" - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
- apsbin-volume:/var/lib/postgresql/data:rw - apsbin-volume:/var/lib/postgresql/data:rw
activiti-admin: activiti-admin:
@ -32,7 +32,7 @@ services:
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
ACTIVITI_ADMIN_REST_APP_PORT: 8080 ACTIVITI_ADMIN_REST_APP_PORT: 8080
JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" JAVA_OPTS: "-Xms64m -Xmx128m"
depends_on: depends_on:
- postgres-aps-admin - postgres-aps-admin
- activiti-app - activiti-app