Merge branch 'acs' into acs-search
This commit is contained in:
commit
2a4b61053d
@ -39,7 +39,7 @@ services:
|
||||
|
||||
postgres-acs:
|
||||
image: postgres:11.7
|
||||
mem_limit: 512m
|
||||
mem_limit: 128m
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=alfresco
|
||||
- POSTGRES_USER=alfresco
|
||||
@ -59,11 +59,12 @@ services:
|
||||
|
||||
activemq:
|
||||
image: alfresco/alfresco-activemq:5.15.8
|
||||
mem_limit: 256m
|
||||
mem_limit: 512m
|
||||
|
||||
proxy:
|
||||
build: ./nginx-ingress
|
||||
image: local/nginx-ingress:acs
|
||||
mem_limit: 256m
|
||||
ports:
|
||||
- 8080:8080
|
||||
depends_on:
|
||||
|
Loading…
x
Reference in New Issue
Block a user