Merge branch 'acs-community.acs-base' into acs-search-community.acs-community

This commit is contained in:
Brian Long 2020-12-17 13:22:28 -05:00
commit 82d6fd5c8a

View File

@ -4,7 +4,7 @@
version: "2" version: "2"
services: services:
alfresco: platform:
image: alfresco/alfresco-content-repository-community:6.2.2-RC1 image: alfresco/alfresco-content-repository-community:6.2.2-RC1
mem_limit: 1700m mem_limit: 1700m
environment: environment:
@ -19,12 +19,12 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE -Ddeployment.method=DOCKER_COMPOSE
-Dcsrf.filter.enabled=false
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-Dtransform.service.enabled=false -Dtransform.service.enabled=false
-Dlocal.transform.service.enabled=false -Dlocal.transform.service.enabled=false
-Dcsrf.filter.enabled=false
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0 -Dsystem.content.orphanProtectDays=0
" "
@ -33,7 +33,7 @@ services:
- activemq - activemq
postgres-acs: postgres-acs:
image: postgres:11.4 image: postgres:11.7
mem_limit: 512m mem_limit: 512m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
@ -54,16 +54,13 @@ services:
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 1g mem_limit: 256m
ports:
- 8161:8161 # HTTP
- 5672:5672 # AMQP
- 61616:61616 # OpenWire
- 61613:61613 # STOMP
proxy: proxy:
image: alfresco/alfresco-acs-nginx:3.0.2 image: alfresco/alfresco-acs-nginx:3.0.2
environment:
REPO_URL: "http://platform:8080"
depends_on: depends_on:
- alfresco - platform
ports: ports:
- 8080:8080 - 8080:8080