Merge branch 'aps-search' into aps-search-persist
This commit is contained in:
commit
607590c1dd
1
.env
1
.env
@ -7,3 +7,4 @@ PROXY_PORT=8080
|
|||||||
|
|
||||||
APS_TAG=2.4.1
|
APS_TAG=2.4.1
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
|
ELASTICSEARCH_TAG=7.17.13
|
||||||
|
@ -12,9 +12,14 @@ 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
|
||||||
|
- search-aps
|
||||||
volumes:
|
volumes:
|
||||||
- "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.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
|
||||||
@ -53,6 +58,15 @@ services:
|
|||||||
command: postgres -c max_connections=50 -c log_min_messages=LOG
|
command: postgres -c max_connections=50 -c log_min_messages=LOG
|
||||||
volumes:
|
volumes:
|
||||||
- apsadmindb-volume:/var/lib/postgresql/data:rw
|
- apsadmindb-volume:/var/lib/postgresql/data:rw
|
||||||
|
|
||||||
|
search-aps:
|
||||||
|
image: elasticsearch:${ELASTICSEARCH_TAG}
|
||||||
|
environment:
|
||||||
|
discovery.type: single-node
|
||||||
|
ulimits:
|
||||||
|
memlock:
|
||||||
|
soft: -1
|
||||||
|
hard: -1
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
|
Loading…
x
Reference in New Issue
Block a user