Merge branch 'acs-frontend' into acs-frontend-persist
This commit is contained in:
commit
ff441fc4d6
@ -49,6 +49,7 @@ services:
|
||||
|
||||
transform-core-aio:
|
||||
image: alfresco/alfresco-transform-core-aio:2.3.6
|
||||
mem_limit: 1g
|
||||
|
||||
share:
|
||||
image: alfresco/alfresco-share:6.2.2
|
||||
@ -68,7 +69,7 @@ services:
|
||||
|
||||
postgres-acs:
|
||||
image: postgres:11.7
|
||||
mem_limit: 512m
|
||||
mem_limit: 128m
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=alfresco
|
||||
- POSTGRES_USER=alfresco
|
||||
@ -79,7 +80,7 @@ services:
|
||||
|
||||
search:
|
||||
image: alfresco/alfresco-search-services:2.0.1
|
||||
mem_limit: 2g
|
||||
mem_limit: 1g
|
||||
environment:
|
||||
- SOLR_ALFRESCO_HOST=platform
|
||||
- SOLR_ALFRESCO_PORT=8080
|
||||
@ -92,13 +93,14 @@ services:
|
||||
|
||||
activemq:
|
||||
image: alfresco/alfresco-activemq:5.15.8
|
||||
mem_limit: 256m
|
||||
mem_limit: 512m
|
||||
volumes:
|
||||
- activemq-volume:/opt/activemq/data:rw
|
||||
|
||||
proxy:
|
||||
build: ./nginx-ingress
|
||||
image: local/nginx-ingress:acs-share
|
||||
mem_limit: 256m
|
||||
ports:
|
||||
- 8080:8080
|
||||
depends_on:
|
||||
|
Loading…
x
Reference in New Issue
Block a user