Merge branch 'acs' into acs-mysql
This commit is contained in:
commit
c5171fdb51
@ -45,11 +45,12 @@ services:
|
|||||||
|
|
||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:5.15.8
|
image: alfresco/alfresco-activemq:5.15.8
|
||||||
mem_limit: 256m
|
mem_limit: 512m
|
||||||
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs
|
||||||
|
mem_limit: 256m
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user