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

This commit is contained in:
Brian Long 2020-12-17 13:24:15 -05:00
commit 69974eaeea

View File

@ -13,7 +13,8 @@ services:
-Ddb.username=alfresco -Ddb.username=alfresco
-Ddb.password=alfresco -Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dindex.subsystem.name=noindex -Dindex.subsystem.name=solr6
-Dsolr.host=search
-Dalfresco.host=localhost -Dalfresco.host=localhost
-Dalfresco.port=8080 -Dalfresco.port=8080
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
@ -41,13 +42,13 @@ services:
- POSTGRES_DB=alfresco - POSTGRES_DB=alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
solr6: search:
image: alfresco/alfresco-search-services:2.0.1 image: alfresco/alfresco-search-services:2.0.1
mem_limit: 2g mem_limit: 2g
environment: environment:
- SOLR_ALFRESCO_HOST=alfresco - SOLR_ALFRESCO_HOST=platform
- SOLR_ALFRESCO_PORT=8080 - SOLR_ALFRESCO_PORT=8080
- SOLR_SOLR_HOST=solr6 - SOLR_SOLR_HOST=search
- SOLR_SOLR_PORT=8983 - SOLR_SOLR_PORT=8983
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
- ALFRESCO_SECURE_COMMS=none - ALFRESCO_SECURE_COMMS=none