Merge branch 'aps' into dbp
This commit is contained in:
commit
f2e95a44f3
2
.env
2
.env
@ -9,9 +9,11 @@ ACS_TAG=7.3.0
|
|||||||
ATR_TAG=2.0.0
|
ATR_TAG=2.0.0
|
||||||
ATE_AIO_TAG=3.0.0
|
ATE_AIO_TAG=3.0.0
|
||||||
ASFS_TAG=2.0.0
|
ASFS_TAG=2.0.0
|
||||||
|
APS_TAG=2.3.5
|
||||||
AAMQ_TAG=5.17.1-jre17-centos7
|
AAMQ_TAG=5.17.1-jre17-centos7
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
ASIE_TAG=2.0.5
|
ASIE_TAG=2.0.5
|
||||||
ACS_SHARE_TAG=7.3.0
|
ACS_SHARE_TAG=7.3.0
|
||||||
ALF_SYNC_SERV_TAG=3.7
|
ALF_SYNC_SERV_TAG=3.7
|
||||||
ADW_TAG=3.1.0
|
ADW_TAG=3.1.0
|
||||||
|
ELASTICSEARCH_TAG=7.17.7
|
||||||
|
@ -149,8 +149,7 @@ services:
|
|||||||
APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
|
APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
|
||||||
|
|
||||||
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
|
||||||
@ -161,15 +160,14 @@ 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"
|
||||||
|
|
||||||
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
|
||||||
@ -178,14 +176,13 @@ 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
|
||||||
|
|
||||||
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
|
||||||
@ -193,8 +190,7 @@ services:
|
|||||||
command: postgres -c max_connections=300 -c log_min_messages=LOG
|
command: postgres -c max_connections=300 -c log_min_messages=LOG
|
||||||
|
|
||||||
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
|
||||||
@ -202,8 +198,7 @@ services:
|
|||||||
command: postgres -c max_connections=50 -c log_min_messages=LOG
|
command: postgres -c max_connections=50 -c log_min_messages=LOG
|
||||||
|
|
||||||
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"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user