Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist

This commit is contained in:
Brian Long 2021-01-06 16:43:39 -05:00
commit c7378dd9c2

View File

@ -23,6 +23,12 @@ services:
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-Djodconverter.url=http://transform-core-aio:8090/
-Dimg.url=http://transform-core-aio:8090/
-Dtika.url=http://transform-core-aio:8090/
-Dtransform.misc.url=http://transform-core-aio:8090/
-Dcsrf.filter.enabled=false
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
@ -47,6 +53,7 @@ services:
- shared-file-store
volumes:
- "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
- acsbin-volume:/usr/local/tomcat/alf_data:rw
transform-router:
image: quay.io/alfresco/alfresco-transform-router:1.3.1
@ -80,6 +87,8 @@ services:
- POSTGRES_USER=alfresco
- POSTGRES_DB=alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
volumes:
- acsdb-volume:/var/lib/postgresql/data:rw
search:
image: alfresco/alfresco-search-services:2.0.1
@ -91,10 +100,14 @@ services:
- SOLR_SOLR_PORT=8983
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
- ALFRESCO_SECURE_COMMS=none
volumes:
- solrindex-volume:/opt/alfresco-search-services/data:rw
activemq:
image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m
volumes:
- activemq-volume:/opt/activemq/data:rw
proxy:
build: ./nginx-ingress
@ -109,3 +122,11 @@ volumes:
driver_opts:
type: tmpfs
device: tmpfs
acsbin-volume:
driver: local
acsdb-volume:
driver: local
activemq-volume:
driver: local
solrindex-volume:
driver: local