fixed after testing

This commit is contained in:
Brian Long 2021-01-13 15:20:03 -05:00
parent 2b7755222b
commit 695e3b3dc0

View File

@ -6,6 +6,7 @@ version: "2"
services: services:
activiti-app: activiti-app:
image: alfresco/process-services:1.11.1.1 image: alfresco/process-services:1.11.1.1
mem_limit: 512m
environment: environment:
ACTIVITI_DATASOURCE_USERNAME: alfresco ACTIVITI_DATASOURCE_USERNAME: alfresco
ACTIVITI_DATASOURCE_PASSWORD: alfresco ACTIVITI_DATASOURCE_PASSWORD: alfresco
@ -16,54 +17,58 @@ 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"
depends_on: depends_on:
- postgres-aps - postgres-aps
volumes: volumes:
- "$LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro" - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
activiti-admin: activiti-admin:
image: alfresco/process-services-admin:latest image: alfresco/process-services-admin:1.11.1.1
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
ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti?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"
depends_on: depends_on:
- postgres-aps-admin - postgres-aps-admin
- activiti-app - activiti-app
postgres-aps: postgres-aps:
image: postgres:11.6 image: postgres:11.6
mem_limit: 256m
environment: environment:
POSTGRES_DB: postgres-aps POSTGRES_DB: activiti
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
POSTGRES_PASSWORD: alfresco POSTGRES_PASSWORD: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
postgres-aps-admin: postgres-aps-admin:
image: postgres:11.6 image: postgres:11.6
mem_limit: 128m
environment: environment:
POSTGRES_DB: postgres-aps-admin POSTGRES_DB: activiti-admin
POSTGRES_USER: alfresco POSTGRES_USER: alfresco
POSTGRES_PASSWORD: alfresco POSTGRES_PASSWORD: alfresco
command: postgres -c max_connections=50 -c log_min_messages=LOG
search-aps: search-aps:
image: elasticsearch:7.6.0 image: elasticsearch:7.6.0
container_name: elasticsearch mem_limit: 512m
environment: environment:
- node.name=elasticsearch discovery.type: single-node
- cluster.name=aps-es-cluster ES_JAVA_OPTS: "-Xms64m -Xmx256m"
- cluster.initial_master_nodes=elasticsearch
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
hard: -1 hard: -1
depends_on: depends_on:
- activit-app - activiti-app
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress