inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search-1704: Fix solr.in.cmd to start with Java 11

Browse Source
This commit is contained in:
Meenal Bhave
2019-06-21 17:03:28 +01:00
parent 2e0b23acb8
commit 2de49b0be2
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
search-services/packaging/config.properties
View File

@@ -3,7 +3,7 @@ alfresco.search.ssl.need=needclientauth" default="true"
alfresco.search.logs=SOLR_LOGS_DIR=../../logs\ alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties
alfresco.gc.logs=GC_LOG_OPTS="" alfresco.gc.logs=GC_LOG_OPTS=""
alfresco.gc.logs.win=set "GC_LOG_OPTS= " alfresco.gc.logs.win=REM set "GC_LOG_OPTS= "
alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\ alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\
${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties
alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\ alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\

10
search-services/packaging/src/docker/5.x/docker-compose.yml
View File

@@ -3,7 +3,13 @@ services:
platform: platform:
image: docker-internal.alfresco.com/platform:${ALFRESCO_TAG} image: docker-internal.alfresco.com/platform:${ALFRESCO_TAG}
environment: environment:
JAVA_TOOL_OPTIONS: "-Dsolr.host=search -Dsolr.port=8983 -Dsolr.secureComms=none -Dsolr.base.url=/solr -Dindex.subsystem.name=solr6" JAVA_TOOL_OPTIONS: "
-Dsolr.host=search
-Dsolr.port=8983
-Dsolr.secureComms=none
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
"
ports: ports:
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi - "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
- "5005:5005" #Java debugging - "5005:5005" #Java debugging
@@ -21,5 +27,7 @@ services:
SOLR_SOLR_PORT: 8983 SOLR_SOLR_PORT: 8983
#Create the default alfresco and archive cores #Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
#HTTP by default
ALFRESCO_SECURE_COMMS: none
ports: ports:
- "8083:8983" #Browser port for Solr - "8083:8983" #Browser port for Solr