Merge branch 'acs-search' into acs-backend-enterprise

This commit is contained in:
Brian Long 2022-11-01 16:34:46 -04:00
commit 8bc64cd881
2 changed files with 11 additions and 10 deletions

1
.env
View File

@ -11,4 +11,5 @@ ATE_AIO_TAG=3.0.0
ASFS_TAG=2.0.0 ASFS_TAG=2.0.0
AAMQ_TAG=5.17.1-jre17-centos7 AAMQ_TAG=5.17.1-jre17-centos7
POSTGRES_TAG=13 POSTGRES_TAG=13
ASIE_TAG=2.0.5
ALF_SYNC_SERV_TAG=3.7 ALF_SYNC_SERV_TAG=3.7

View File

@ -24,8 +24,8 @@ services:
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.secureComms=secret
-Dsolr.secureComms=none -Dsolr.sharedSecret=alfresco-secret
-Dalfresco.host=${PROXY_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
@ -88,15 +88,15 @@ services:
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
search: search:
image: alfresco/alfresco-search-services:2.0.1 image: alfresco/alfresco-search-services:${ASIE_TAG}
mem_limit: 1g
environment: environment:
- SOLR_ALFRESCO_HOST=platform SOLR_ALFRESCO_HOST: platform
- SOLR_ALFRESCO_PORT=8080 SOLR_SOLR_HOST: search
- SOLR_SOLR_HOST=search SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
- SOLR_SOLR_PORT=8983 ALFRESCO_SECURE_COMMS: secret
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive JAVA_TOOL_OPTIONS: "
- ALFRESCO_SECURE_COMMS=none -Dalfresco.secureComms.secret=alfresco-secret
"
activemq: activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG} image: alfresco/alfresco-activemq:${AAMQ_TAG}