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

This commit is contained in:
Brian Long 2020-12-26 13:50:37 -05:00
commit 253b7fd3f2
2 changed files with 15 additions and 4 deletions

11
.env
View File

@ -1,3 +1,10 @@
BASEDIR=~ EXTERNAL_RESOURCE_DIR=~
ALFRESCO_DIR=${BASEDIR}/alfresco ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
PROXY_PLATFORM_PROTOCOL=http
PROXY_PLATFORM_HOST=localhost
PROXY_PLATFORM_PORT=8080
PROXY_SHARE_PROTOCOL=http
PROXY_SHARE_HOST=localhost
PROXY_SHARE_PORT=8080

View File

@ -17,8 +17,12 @@ services:
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.port=8983
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dalfresco.host=localhost -Dshare.host=${PROXY_SHARE_HOST}
-Dalfresco.port=8080 -Dshare.port=${PROXY_SHARE_PORT}
-Dshare.protocol=${PROXY_SHARE_PROTOCOL}
-Dalfresco.host=${PROXY_PLATFORM_HOST}
-Dalfresco.port=${PROXY_PLATFORM_PORT}
-Dalfresco.protocol=${PROXY_PLATFORM_PROTOCOL}
-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